View | Details | Raw Unified | Return to bug 224384 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp (+53 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp
3 
@@ -144,7 +144,7 @@ bool    tsPacket::setPos(uint64_t pos)
4 
 {
5 
     if(!_file->setpos(pos))
6 
     {
7 
-        printf("[tsPacket] Cannot seek to %"PRIx64"\n", pos);
8 
+        printf("[tsPacket] Cannot seek to %" PRIx64"\n", pos);
9 
         return false;
10 
     }
11 
     return true;
12 
@@ -387,7 +387,7 @@ nextPack3:
13 
     zprintf("[TS Demuxer] Code=0x%x pid=0x%x\n",code,pes->pid);
14 
     if((code&0xffffff00)!=0x100)
15 
     {
16 
-        printf("[Ts Demuxer] No PES startcode at 0x%"PRIx64"\n",pkt.startAt);
17 
+        printf("[Ts Demuxer] No PES startcode at 0x%" PRIx64"\n",pkt.startAt);
18 
         printf("0x:%02x %02x %02x %02x\n",pkt.payload[4],pkt.payload[5],pkt.payload[6],pkt.payload[7]);
19 
         goto nextPack3;
20 
     }
21 
@@ -433,7 +433,7 @@ nextPack3:
22 
 /**
23 
     \fn decodePesHeader
24 
 */
25 
-#define fail(x) {printf("[Ts Demuxer]*********"x"*******\n");return false;}
26 
+#define fail(x) {printf("[Ts Demuxer]*********" x"*******\n");return false;}
27 
 bool tsPacket::decodePesHeader(TS_PESpacket *pes)
28 
 {
29 
     uint8_t  *start=pes->payload+6;
30 
@@ -735,7 +735,7 @@ bool    tsPacketLinear::read(uint32_t le
31 
 */
32 
 bool    tsPacketLinear::getInfo(dmxPacketInfo *info)
33 
 {
34 
-#warning FIXME
35 
+//#warning FIXME
36 
     if(pesPacket->offset<4)
37 
     {
38 
         info->startAt=this->oldStartAt;
39 
@@ -780,12 +780,12 @@ bool    tsPacketLinear::seek(uint64_t pa
40 
 {
41 
     if(!_file->setpos(packetStart))
42 
     {
43 
-        printf("[tsPacket] Cannot seek to %"PRIx64"\n",packetStart);
44 
+        printf("[tsPacket] Cannot seek to %" PRIx64"\n",packetStart);
45 
         return 0;
46 
     }
47 
     if(!refill())
48 
     {
49 
-        printf("[tsPacketLinear] Seek to %"PRIx64":%"PRIx32" failed\n",packetStart,offset);
50 
+        printf("[tsPacketLinear] Seek to %" PRIx64":%" PRIx32" failed\n",packetStart,offset);
51 
         return false;
52 
     }
53 
     ADM_assert(offset<pesPacket->payloadSize);
(-)files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp (+11 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp
3 
@@ -44,7 +44,7 @@ typedef struct
4
5 
 static const dvProfileClass supportedProfiles[]=
6 
 {
7 
-    {720,480,29.97,dvColor422},
8 
+    {720,480,30,dvColor422},
9 
     {720,576,25,dvColor420},
10 
 };
11
(-)files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h (+14 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h
3 
@@ -43,9 +43,9 @@
4 
           0,				/* max_b_frames */ \
5 
           0,				/* mpeg_quant */ \
6 
           1,				/* is_luma_elim_threshold */ \
7 
-          -2,				/* luma_elim_threshold */ \
8 
+          0,				/* luma_elim_threshold */ \
9 
           1,				/* is_chroma_elim_threshold */ \
10 
-          -5,				/* chroma_elim_threshold */ \
11 
+          0,				/* chroma_elim_threshold */ \
12 
           0.05,				/*lumi_masking */ \
13 
           1,				/* is lumi */ \
14 
           0.01,				/*dark_masking */ \
(-)files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h (+14 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h
3 
@@ -53,9 +53,9 @@ enum
4 
           2,				/* max_b_frames */ \
5 
           1,				/* mpeg_quant */ \
6 
           1,				/* is_luma_elim_threshold */ \
7 
-          -2,				/* luma_elim_threshold */ \
8 
+          0,				/* luma_elim_threshold */ \
9 
           1,				/* is_chroma_elim_threshold */ \
10 
-          -5,				/* chroma_elim_threshold */ \
11 
+          0,				/* chroma_elim_threshold */ \
12 
           0.05,				/*lumi_masking */ \
13 
           1,				/* is lumi */ \
14 
           0.01,				/*dark_masking */ \
(-)files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h (+14 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h
3 
@@ -43,9 +43,9 @@
4 
 		2,				/* max_b_frames */ \
5 
 		0,				/* mpeg_quant */ \
6 
 		1,				/* is_luma_elim_threshold */ \
7 
-		-2,				/* luma_elim_threshold */ \
8 
+		0,				/* luma_elim_threshold */ \
9 
 		1,				/* is_chroma_elim_threshold */ \
10 
-		-5,				/* chroma_elim_threshold */ \
11 
+		0,				/* chroma_elim_threshold */ \
12 
 		0.05,				/*lumi_masking */ \
13 
 		1,				/* is lumi */ \
14 
 		0.01,				/*dark_masking */ \
(-)files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp (+34 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp
3 
@@ -173,7 +173,7 @@ again:
4 
         //return false;
5 
     }else
6 
     {
7 
-        //printf("[PPPP] x264 Incoming : %"PRIu64"us \n",image->Pts);
8 
+        //printf("[PPPP] x264 Incoming : %" PRIu64"us \n",image->Pts);
9 
         // 2-preamble
10 
         if(false==preAmble(image))
11 
         {
12 
@@ -289,11 +289,11 @@ bool x264Encoder::postAmble (ADMBitstrea
13 
         }
14 
         //------
15 
         aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts);
16 
-        aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts,
17 
+        aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts,
18 
                     out->pts-out->dts);
19 
         if(out->dts>out->pts)
20 
         {
21 
-            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n",
22 
+            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n",
23 
                         out->dts,out->pts);
24 
             if(picout->i_type!=X264_TYPE_B && picout->i_type!=X264_TYPE_BREF)
25 
             {
26 
@@ -341,7 +341,7 @@ bool x264Encoder::postAmble (ADMBitstrea
27 
           ADM_error ("[x264] Unknown image type: %d\n", picout->i_type);
28 
           //ADM_assert(0);
29 
         }
30 
-        //printf("[OOOO] x264 Outgoing : %"PRIu64"us \n",out->dts);
31 
+        //printf("[OOOO] x264 Outgoing : %" PRIu64"us \n",out->dts);
32 
         out->out_quantizer = picout->i_qpplus1;
33 
         return true;
34 
 }
(-)files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h (+11 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h
3 
@@ -108,7 +108,7 @@ extern "C"
4 
 	1.0,	/* float rate_tolerance; */ \
5 
 	0,	/* uint32_t vbv_max_bitrate; */ \
6 
 	0,	/* uint32_t vbv_buffer_size; */ \
7 
-	0.9,	/* uint32_t vbv_buffer_init; */ \
8 
+	1,	/* uint32_t vbv_buffer_init; */ \
9 
 	1.4,	/* float ip_factor; */ \
10 
 	1.3,	/* float pb_factor; */ \
11 
 	1,	/* uint32_t aq_mode; */ \
(-)files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp (+11 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp
3 
@@ -38,7 +38,7 @@ typedef struct
4 
 }idcToken;
5
6 
 static const idcToken listOfIdc[]={
7 
-        {-1,"Auto"},
8 
+  {(unsigned int)-1,"Auto"},
9 
         {10,"1"},
10 
         {11,"1.1"},
11 
         {12,"1.2"},
(-)files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp (+16 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp
3 
@@ -284,11 +284,11 @@ bool x265Encoder::postAmble (ADMBitstrea
4 
         }
5 
         //------
6 
         aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts);
7 
-        aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts,
8 
+        aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts,
9 
                     out->pts-out->dts);
10 
         if(out->dts>out->pts)
11 
         {
12 
-            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n",
13 
+            ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n",
14 
                         out->dts,out->pts);
15 
             if(picout->sliceType!=X265_TYPE_B && picout->sliceType!=X265_TYPE_BREF)
16 
             {
(-)files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h (+11 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h
3 
@@ -85,7 +85,7 @@ extern "C"
4 
 	1.0,	/* float rate_tolerance; */ \
5 
 	0,	/* uint32_t vbv_max_bitrate; */ \
6 
 	0,	/* uint32_t vbv_buffer_size; */ \
7 
-	0.9,	/* uint32_t vbv_buffer_init; */ \
8 
+	1,	/* uint32_t vbv_buffer_init; */ \
9 
 	1.4,	/* float ip_factor; */ \
10 
 	1.3,	/* float pb_factor; */ \
11 
 	2,	/* uint32_t aq_mode; */ \
(-)files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp (+11 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp
3 
@@ -38,7 +38,7 @@ typedef struct
4 
 }idcToken;
5
6 
 static const idcToken listOfIdc[]={
7 
-        {-1,"Auto"},
8 
+        {(unsigned int)-1,"Auto"},
9 
         {10,"1"},
10 
         {20,"2"},
11 
         {21,"2.1"},
(-)files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp (+20 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp
3 
@@ -54,7 +54,7 @@ typedef enum
4 
         RD_SQUARE = RD_HPEL_QPEL_8 | XVID_ME_EXTSEARCH_RD
5 
 } RateDistortionMode;
6
7 
-uint32_t rdMode[5]=
8 
+int32_t rdMode[5]=
9 
 {
10 
     RD_NONE,
11 
     RD_DCT_ME,
12 
@@ -332,7 +332,7 @@ again:
13 
     // Store Pts/DTS
14 
     ADM_timeMapping map; // Store real PTS <->lav value mapping
15 
     map.realTS=image->Pts+getEncoderDelay();
16 
-    aprintf("Pushing fn=%d Time=%"PRIu64"\n",frameNum,map.realTS);
17 
+    aprintf("Pushing fn=%d Time=%" PRIu64"\n",frameNum,map.realTS);
18
19 
     map.internalTS=frameNum++;
20 
     mapper.push_back(map);
(-)files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp (+29 lines)
Line 0 Link Here
1 
--- avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp.orig	2016-01-29 08:47:25 UTC
2 
+++ avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
3 
@@ -240,7 +240,7 @@ teleCide *_param=&configuration;
4 
                         {
5 
                                 // The chosen frame doesn't match the prediction.
6 
                                 if (predicted_metric == 0) mismatch = 0.0;
7 
-                                else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
8 
+                                else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
9 
                                 if (mismatch < gthresh)
10 
                                 {
11 
                                         // It's close enough, so use the predicted one.
12 
@@ -283,7 +283,7 @@ teleCide *_param=&configuration;
13 
                                         {
14 
                                                 // The chosen frame doesn't match the prediction.
15 
                                                 if (predicted_metric == 0) mismatch = 0.0;
16 
-                                                else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
17 
+                                                else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
18 
                                                 if ((int) mismatch <= gthresh)
19 
                                                 {
20 
                                                         // It's close enough, so use the predicted one.
21 
@@ -394,7 +394,7 @@ teleCide *_param=&configuration;
22 
         {
23 
                 unsigned char *dstpp, *dstpn;
24 
                 int v1, v2, z;
25 
-                #warning blend in place is wrong!
26 
+                //#warning blend in place is wrong!
27 
                 final=dst;
28 
                 // MeanX:We should copy here as we blend from source and destination
29 
                 // for the moment we do it in place, it is wrong.

Return to bug 224384