har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/yuv4mpegdec: fix seeking for partial files

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-03-02 20:56:01 +01:00
parent ecba35bbe3
commit dd2ea5cbfb
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/yuv4mpegdec.c
View File

@ -307,7 +307,8 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt)
static int yuv4_read_seek(AVFormatContext *s, int stream_index, static int yuv4_read_seek(AVFormatContext *s, int stream_index,
int64_t pts, int flags) int64_t pts, int flags)
{ {
avio_seek(s->pb, pts * s->packet_size + s->internal->data_offset, SEEK_SET); if (avio_seek(s->pb, pts * s->packet_size + s->internal->data_offset, SEEK_SET) < 0)
return -1;
return 0; return 0;
} }

24
tests/ref/seek/lavf-yuv4mpeg
View File

@ -1,53 +1,45 @@
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 64 size:152064
ret: 0 st:-1 flags:0 ts:-1.000000 ret:-1 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts: 0.040000 pts: 0.040000 pos: 152134 size:152064
ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st:-1 flags:1 ts: 1.894167
ret:-EOF ret:-EOF
ret: 0 st: 0 flags:0 ts: 0.800000 ret: 0 st: 0 flags:0 ts: 0.800000
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3041464 size:152064 ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3041464 size:152064
ret: 0 st: 0 flags:1 ts:-0.320000 ret:-1 st: 0 flags:1 ts:-0.320000
ret: 0 st: 0 flags:1 dts: 0.840000 pts: 0.840000 pos:3193534 size:152064
ret: 0 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:0 ts: 2.576668
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:1 ts: 1.470835 ret: 0 st:-1 flags:1 ts: 1.470835
ret:-EOF ret:-EOF
ret: 0 st: 0 flags:0 ts: 0.360000 ret: 0 st: 0 flags:0 ts: 0.360000
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1368694 size:152064 ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1368694 size:152064
ret: 0 st: 0 flags:1 ts:-0.760000 ret:-1 st: 0 flags:1 ts:-0.760000
ret: 0 st: 0 flags:1 dts: 0.400000 pts: 0.400000 pos:1520764 size:152064
ret: 0 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:0 ts: 2.153336
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:1 ts: 1.047503 ret: 0 st:-1 flags:1 ts: 1.047503
ret:-EOF ret:-EOF
ret: 0 st: 0 flags:0 ts:-0.040000 ret:-1 st: 0 flags:0 ts:-0.040000
ret:-EOF
ret: 0 st: 0 flags:1 ts: 2.840000 ret: 0 st: 0 flags:1 ts: 2.840000
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:0 ts: 1.730004
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2433184 size:152064 ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2433184 size:152064
ret: 0 st: 0 flags:0 ts:-0.480000 ret:-1 st: 0 flags:0 ts:-0.480000
ret: 0 st: 0 flags:1 dts: 0.680000 pts: 0.680000 pos:2585254 size:152064
ret: 0 st: 0 flags:1 ts: 2.400000 ret: 0 st: 0 flags:1 ts: 2.400000
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:0 ts: 1.306672
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st:-1 flags:1 ts: 0.200839
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 760414 size:152064 ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 760414 size:152064
ret: 0 st: 0 flags:0 ts:-0.920000 ret:-1 st: 0 flags:0 ts:-0.920000
ret: 0 st: 0 flags:1 dts: 0.240000 pts: 0.240000 pos: 912484 size:152064
ret: 0 st: 0 flags:1 ts: 2.000000 ret: 0 st: 0 flags:1 ts: 2.000000
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st:-1 flags:0 ts: 0.883340
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3345604 size:152064 ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3345604 size:152064
ret: 0 st:-1 flags:1 ts:-0.222493 ret:-1 st:-1 flags:1 ts:-0.222493
ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos:3497674 size:152064
ret: 0 st: 0 flags:0 ts: 2.680000 ret: 0 st: 0 flags:0 ts: 2.680000
ret:-EOF ret:-EOF
ret: 0 st: 0 flags:1 ts: 1.560000 ret: 0 st: 0 flags:1 ts: 1.560000
ret:-EOF ret:-EOF
ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1824904 size:152064 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1824904 size:152064
ret: 0 st:-1 flags:1 ts:-0.645825 ret:-1 st:-1 flags:1 ts:-0.645825
ret: 0 st: 0 flags:1 dts: 0.520000 pts: 0.520000 pos:1976974 size:152064