[FFmpeg-cvslog] r21598 - in trunk: ffmpeg.c tests/ref/lavf/ogg tests/seek.regression.ref

[michael]

Author: michael
Date: Mon Feb  1 23:08:45 2010
New Revision: 21598

Log:
Check pkt.pts against the recording time.
This fixes at least ogg encoding with -t where the file was slightly too long.

Modified:
   trunk/ffmpeg.c
   trunk/tests/ref/lavf/ogg
   trunk/tests/seek.regression.ref

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Feb  1 20:50:17 2010	(r21597)
+++ trunk/ffmpeg.c	Mon Feb  1 23:08:45 2010	(r21598)
@@ -2317,6 +2317,10 @@ static int av_encode(AVFormatContext **o
             }
         }
 
+        /* finish if recording time exhausted */
+        if (pkt.pts * av_q2d(ist->st->time_base) >= (recording_time / 1000000.0))
+            goto discard_packet;
+
         //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
         if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) {
 

Modified: trunk/tests/ref/lavf/ogg
==============================================================================
--- trunk/tests/ref/lavf/ogg	Mon Feb  1 20:50:17 2010	(r21597)
+++ trunk/tests/ref/lavf/ogg	Mon Feb  1 23:08:45 2010	(r21598)
@@ -1,3 +1,3 @@
-767a75e9abf9754bfdc880d6faed69cf *./tests/data/b-lavf.ogg
-14210 ./tests/data/b-lavf.ogg
-./tests/data/b-lavf.ogg CRC=0x37a143ea
+89faca973d88ff2f5dd20992a11de107 *./tests/data/b-lavf.ogg
+14063 ./tests/data/b-lavf.ogg
+./tests/data/b-lavf.ogg CRC=0xf1ae5536

Modified: trunk/tests/seek.regression.ref
==============================================================================
--- trunk/tests/seek.regression.ref	Mon Feb  1 20:50:17 2010	(r21597)
+++ trunk/tests/seek.regression.ref	Mon Feb  1 23:08:45 2010	(r21598)
@@ -3387,7 +3387,7 @@ ret: 0         st: 0 flags:1 dts: NOPTS 
 ret: 0         st: 0 flags:1  ts:-0.317506
 ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1384
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1369
+ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1223
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret:-EIO
 ret: 0         st: 0 flags:0  ts: 0.365011
@@ -3395,7 +3395,7 @@ ret: 0         st: 0 flags:1 dts: NOPTS 
 ret: 0         st: 0 flags:1  ts:-0.740839
 ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1384
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1369
+ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1223
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret:-EIO
 ret: 0         st: 0 flags:0  ts:-0.058322
@@ -3403,7 +3403,7 @@ ret: 0         st: 0 flags:1 dts: NOPTS 
 ret: 0         st: 0 flags:1  ts: 2.835828
 ret:-EIO
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1369
+ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1223
 ret: 0         st:-1 flags:1  ts: 0.624171
 ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1370
 ret: 0         st: 0 flags:0  ts:-0.481655
@@ -3411,7 +3411,7 @@ ret: 0         st: 0 flags:1 dts: NOPTS 
 ret: 0         st: 0 flags:1  ts: 2.412494
 ret:-EIO
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1369
+ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1223
 ret: 0         st:-1 flags:1  ts: 0.200839
 ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1384
 ret: 0         st: 0 flags:0  ts:-0.904989
@@ -3419,11 +3419,11 @@ ret: 0         st: 0 flags:1 dts: NOPTS 
 ret: 0         st: 0 flags:1  ts: 1.989184
 ret:-EIO
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret:-EIO
+ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1223
 ret: 0         st:-1 flags:1  ts:-0.222493
 ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1384
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1369
+ret: 0         st: 0 flags:1 dts: NOPTS    pts: NOPTS    pos:     -1 size:  1223
 ret: 0         st: 0 flags:1  ts: 1.565850
 ret:-EIO
 ret: 0         st:-1 flags:0  ts: 0.460008