mmap changes

Author: roman10

config.h

@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-shared --enable-static --disable-everything --enable-demuxer=mov --enable-demuxer=h264 --enable-protocol=file --enable-avformat --enable-avcodec --enable-decoder=rawvideo --enable-decoder=mjpeg --enable-decoder=h263 --enable-decoder=mpeg4 --enable-decoder=h264 --enable-parser=h264 --disable-network --enable-zlib --disable-avfilter --disable-avdevice --enable-pthreads"
+#define FFMPEG_CONFIGURATION "--disable-shared --enable-static --disable-everything --enable-demuxer=mov --enable-demuxer=h264 --enable-protocol=file --enable-avformat --enable-avcodec --enable-decoder=rawvideo --enable-decoder=mjpeg --enable-decoder=h263 --enable-decoder=mpeg4 --enable-decoder=h264 --enable-parser=h264 --disable-network --enable-zlib --disable-avfilter --disable-avdevice --enable-pthreads --disable-doc"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -170,7 +170,7 @@
 #define CONFIG_BZLIB 0
 #define CONFIG_CRYSTALHD 0
 #define CONFIG_DCT 0
-#define CONFIG_DOC 1
+#define CONFIG_DOC 0
 #define CONFIG_DWT 0
 #define CONFIG_DXVA2 0
 #define CONFIG_FASTDIV 1

dependency.c

@@ -983,14 +983,15 @@ void decode_a_video_packet(int p_videoFileIndex, int _roiStH, int _roiStW, int _
             l_selectiveDecodingDataSize = 0;
 			lMbStPos += (gVideoPacketNum - gStFrame)*l_mbHeight*l_mbWidth;
 			lMbEdPos += (gVideoPacketNum - gStFrame)*l_mbHeight*l_mbWidth;
-            l_selectiveDecodingDataSize += *lMbStPos;
+			LOGI(10, "lMbStPos: %d", (*lMbStPos));
+            l_selectiveDecodingDataSize += (*lMbStPos);
             //get the size for needed mbs
             for (l_i = 0; l_i < l_mbHeight; ++l_i) {
                 for (l_j = 0; l_j < l_mbWidth; ++l_j) {
                     if (gVideoCodecCtxList[p_videoFileIndex]->selected_mb_mask[l_i][l_j] == 1) {
 			//LOGI(10, "%d:%d", mbEndPos[gVideoPacketNum - gStFrame][l_i][l_j], mbStartPos[gVideoPacketNum - gStFrame][l_i][l_j]);
                         //l_selectiveDecodingDataSize += (mbEndPos[gVideoPacketNum - gStFrame][l_i][l_j] - mbStartPos[gVideoPacketNum - gStFrame][l_i][l_j]);
-						l_selectiveDecodingDataSize += (*lMbEdPos - *lMbStPos);
+						l_selectiveDecodingDataSize += ((*lMbEdPos) - (*lMbStPos));
 						++lMbEdPos;
 						++lMbStPos;
                     }

ffplay.c

@@ -69,7 +69,7 @@ static void wait_get_dependency() {
         while (g_decode_gop_num >= gVideoPacketQueueList[gCurrentDecodingVideoFileIndex].dep_gop_num) {
 			/*[TODO]it might be more appropriate to use some sort of signal*/
 			LOGI(10, ".......waiting for dependency for video %d, on gop %d, decode gop %d", gCurrentDecodingVideoFileIndex, gVideoPacketQueueList[gCurrentDecodingVideoFileIndex].dep_gop_num, g_decode_gop_num);
-			usleep(50);    
+			usleep(5000);    
         }
 		LOGI(10, "%d:%d", g_decode_gop_num, gVideoPacketQueueList[gCurrentDecodingVideoFileIndex].dep_gop_num);    
     //}

libavcodec/libavcodec-uninstalled.pc

@@ -1,12 +1,12 @@
 prefix=
 exec_prefix=
 libdir=${pcfiledir}
-includedir=/home/roman10/Desktop/master/ffmpeg-with-selective-decoding
+includedir=/home/roman10/Desktop/github/ffmpeg-with-selective-decoding
 
 Name: libavcodec
 Description: FFmpeg codec library
 Version: 52.117.0
 Requires: 
 Conflicts:
-Libs: ${libdir}/libavcodec.a -lm -pthread -lz 
+Libs: ${libdir}/libavcodec.a -lm -pthread -lbz2 -lz 
 Cflags: -I${includedir}

libavcodec/libavcodec.pc

@@ -9,6 +9,6 @@ Version: 52.117.0
 Requires: 
 Requires.private: 
 Conflicts:
-Libs: -L${libdir} -lavcodec -lm -pthread -lz
+Libs: -L${libdir} -lavcodec -lm -pthread -lbz2 -lz
 Libs.private: 
 Cflags: -I${includedir}

libavformat/libavformat-uninstalled.pc

@@ -1,12 +1,12 @@
 prefix=
 exec_prefix=
 libdir=${pcfiledir}
-includedir=/home/roman10/Desktop/master/ffmpeg-with-selective-decoding
+includedir=/home/roman10/Desktop/github/ffmpeg-with-selective-decoding
 
 Name: libavformat
 Description: FFmpeg container format library
 Version: 52.104.0
 Requires: libavcodec = 52.117.0
 Conflicts:
-Libs: ${libdir}/libavformat.a -lm -pthread -lz 
+Libs: ${libdir}/libavformat.a -lm -pthread -lbz2 -lz 
 Cflags: -I${includedir}

libavformat/libavformat.pc

@@ -9,6 +9,6 @@ Version: 52.104.0
 Requires: libavcodec = 52.117.0
 Requires.private: 
 Conflicts:
-Libs: -L${libdir} -lavformat -lm -pthread -lz
+Libs: -L${libdir} -lavformat -lm -pthread -lbz2 -lz
 Libs.private: 
 Cflags: -I${includedir}

libavutil/libavutil-uninstalled.pc

@@ -1,7 +1,7 @@
 prefix=
 exec_prefix=
 libdir=${pcfiledir}
-includedir=/home/roman10/Desktop/master/ffmpeg-with-selective-decoding
+includedir=/home/roman10/Desktop/github/ffmpeg-with-selective-decoding
 
 Name: libavutil
 Description: FFmpeg utility library

libswscale/libswscale-uninstalled.pc

@@ -1,7 +1,7 @@
 prefix=
 exec_prefix=
 libdir=${pcfiledir}
-includedir=/home/roman10/Desktop/master/ffmpeg-with-selective-decoding
+includedir=/home/roman10/Desktop/github/ffmpeg-with-selective-decoding
 
 Name: libswscale
 Description: FFmpeg image rescaling library

mmaptest.c

@@ -9,7 +9,7 @@
 int main(int argc, char *argv[])
 {
     int fd, offset;
-    char *data;
+    int *data;
     struct stat sbuf;
 	FILE *f;
 
@@ -18,25 +18,25 @@ int main(int argc, char *argv[])
         exit(1);
     }
 
-	f = fopen("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", "w");
-	fprintf(f, "sssssssssssssssssssssssssss");
-	fflush(f);
+	//f = fopen("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", "w");
+	//fprintf(f, "sssssssssssssssssssssssssss");
+	//fflush(f);
 	//this line will cause no such device error
-	printf("fd: %d\n", fd);
-	if (fd = open("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", O_RDONLY) == -1) {			//line caused bug
-    //if ((fd = open("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", O_RDONLY)) == -1) {			//correct source code
+	//printf("fd: %d\n", fd);
+	//if (fd = open("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", O_RDONLY) == -1) {			//line caused bug
+    if ((fd = open("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", O_RDONLY)) == -1) {			//correct source code
         perror("open");
         exit(1);
     }
-	printf("fd: %d\n", fd);
+	//printf("fd: %d\n", fd);
     if (stat("./h1_1280_720_5m.mp4_mbstpos_gop1.txt", &sbuf) == -1) {
         perror("stat");
         exit(1);
     }
-	printf("file size: %ld", sbuf.st_size);
+	printf("file size: %ld\n", sbuf.st_size);
     offset = atoi(argv[1]);
-    if (offset < 0 || offset > sbuf.st_size-1) {
-        fprintf(stderr, "mmapdemo: offset must be in the range 0-%ld\n", sbuf.st_size-1);
+    if (offset < 0 || offset > sbuf.st_size/4-1) {
+        fprintf(stderr, "mmapdemo: offset must be in the range 0-%ld\n", (sbuf.st_size)/4 - 1);
         exit(1);
     }
 
@@ -45,8 +45,8 @@ int main(int argc, char *argv[])
         perror("mmap");
         exit(1);
     }
-
-    printf("byte at offset %d is '%c'\n", offset, data[offset]);
+	
+    printf("byte at offset %d is %d\n", offset, data[offset]);
 
     return 0;
 }