Skip to content

F
ffmpeg.wasm-core
Commit 77811482 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/utils: ff_decode_frame_props: set pkt_size 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a3477fef
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 49 deletions
libavcodec/utils.c
View file @ 77811482
......@@ -835,14 +835,15 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
int size;
AVFrameSideData *frame_sd;
frame->reordered_opaque = avctx->reordered_opaque;
if (!pkt) {
frame->pkt_pts = AV_NOPTS_VALUE;
av_frame_set_pkt_pos (frame, -1);
return 0;
}
frame->pkt_pts = pkt->pts;
av_frame_set_pkt_size (frame, avctx->internal->pkt->size);
/* copy the replaygain data to the output frame */
packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_REPLAYGAIN, &size);
......
tests/ref/fate/ffprobe_compact
View file @ 77811482
This diff is collapsed.
tests/ref/fate/ffprobe_csv
View file @ 77811482
packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K
frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,unknown
packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K
frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2647,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233068,K
frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233068,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263073,K
frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,unknown
packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265151,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495575,K
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495575,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525580,K
frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,unknown
packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K
frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,unknown
packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K
frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529729,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760153,K
frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760153,30000,100,100,rgb24,1:1,I,0,0,0,0,0
packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790158,K
frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,unknown
packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K
frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,unknown
packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K
frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0
frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794307,230400,320,240,rgb24,1:1,I,0,0,0,0,0
packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024731,K
frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0
frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024731,30000,100,100,rgb24,1:1,I,0,0,0,0,0
stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc²
stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt
stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0
......
tests/ref/fate/ffprobe_default
View file @ 77811482
......@@ -58,7 +58,7 @@ best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=2647
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -97,7 +97,7 @@ best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=233068
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......@@ -169,7 +169,7 @@ best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=265151
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -208,7 +208,7 @@ best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=495575
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......@@ -313,7 +313,7 @@ best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=529729
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -352,7 +352,7 @@ best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=760153
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......@@ -457,7 +457,7 @@ best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=794307
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -496,7 +496,7 @@ best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=1024731
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......
tests/ref/fate/ffprobe_flat
View file @ 77811482
......@@ -51,7 +51,7 @@ packets_and_frames.frame.1.best_effort_timestamp_time="0.000000"
packets_and_frames.frame.1.pkt_duration=2048
packets_and_frames.frame.1.pkt_duration_time="0.040000"
packets_and_frames.frame.1.pkt_pos="2647"
packets_and_frames.frame.1.pkt_size="N/A"
packets_and_frames.frame.1.pkt_size="230400"
packets_and_frames.frame.1.width=320
packets_and_frames.frame.1.height=240
packets_and_frames.frame.1.pix_fmt="rgb24"
......@@ -86,7 +86,7 @@ packets_and_frames.frame.2.best_effort_timestamp_time="0.000000"
packets_and_frames.frame.2.pkt_duration=2048
packets_and_frames.frame.2.pkt_duration_time="0.040000"
packets_and_frames.frame.2.pkt_pos="233068"
packets_and_frames.frame.2.pkt_size="N/A"
packets_and_frames.frame.2.pkt_size="30000"
packets_and_frames.frame.2.width=100
packets_and_frames.frame.2.height=100
packets_and_frames.frame.2.pix_fmt="rgb24"
......@@ -150,7 +150,7 @@ packets_and_frames.frame.4.best_effort_timestamp_time="0.040000"
packets_and_frames.frame.4.pkt_duration=2048
packets_and_frames.frame.4.pkt_duration_time="0.040000"
packets_and_frames.frame.4.pkt_pos="265151"
packets_and_frames.frame.4.pkt_size="N/A"
packets_and_frames.frame.4.pkt_size="230400"
packets_and_frames.frame.4.width=320
packets_and_frames.frame.4.height=240
packets_and_frames.frame.4.pix_fmt="rgb24"
......@@ -185,7 +185,7 @@ packets_and_frames.frame.5.best_effort_timestamp_time="0.040000"
packets_and_frames.frame.5.pkt_duration=2048
packets_and_frames.frame.5.pkt_duration_time="0.040000"
packets_and_frames.frame.5.pkt_pos="495575"
packets_and_frames.frame.5.pkt_size="N/A"
packets_and_frames.frame.5.pkt_size="30000"
packets_and_frames.frame.5.width=100
packets_and_frames.frame.5.height=100
packets_and_frames.frame.5.pix_fmt="rgb24"
......@@ -278,7 +278,7 @@ packets_and_frames.frame.8.best_effort_timestamp_time="0.080000"
packets_and_frames.frame.8.pkt_duration=2048
packets_and_frames.frame.8.pkt_duration_time="0.040000"
packets_and_frames.frame.8.pkt_pos="529729"
packets_and_frames.frame.8.pkt_size="N/A"
packets_and_frames.frame.8.pkt_size="230400"
packets_and_frames.frame.8.width=320
packets_and_frames.frame.8.height=240
packets_and_frames.frame.8.pix_fmt="rgb24"
......@@ -313,7 +313,7 @@ packets_and_frames.frame.9.best_effort_timestamp_time="0.080000"
packets_and_frames.frame.9.pkt_duration=2048
packets_and_frames.frame.9.pkt_duration_time="0.040000"
packets_and_frames.frame.9.pkt_pos="760153"
packets_and_frames.frame.9.pkt_size="N/A"
packets_and_frames.frame.9.pkt_size="30000"
packets_and_frames.frame.9.width=100
packets_and_frames.frame.9.height=100
packets_and_frames.frame.9.pix_fmt="rgb24"
......@@ -406,7 +406,7 @@ packets_and_frames.frame.12.best_effort_timestamp_time="0.120000"
packets_and_frames.frame.12.pkt_duration=2048
packets_and_frames.frame.12.pkt_duration_time="0.040000"
packets_and_frames.frame.12.pkt_pos="794307"
packets_and_frames.frame.12.pkt_size="N/A"
packets_and_frames.frame.12.pkt_size="230400"
packets_and_frames.frame.12.width=320
packets_and_frames.frame.12.height=240
packets_and_frames.frame.12.pix_fmt="rgb24"
......@@ -441,7 +441,7 @@ packets_and_frames.frame.13.best_effort_timestamp_time="0.120000"
packets_and_frames.frame.13.pkt_duration=2048
packets_and_frames.frame.13.pkt_duration_time="0.040000"
packets_and_frames.frame.13.pkt_pos="1024731"
packets_and_frames.frame.13.pkt_size="N/A"
packets_and_frames.frame.13.pkt_size="30000"
packets_and_frames.frame.13.width=100
packets_and_frames.frame.13.height=100
packets_and_frames.frame.13.pix_fmt="rgb24"
......
tests/ref/fate/ffprobe_ini
View file @ 77811482
......@@ -60,7 +60,7 @@ best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=2647
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -99,7 +99,7 @@ best_effort_timestamp_time=0.000000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=233068
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......@@ -171,7 +171,7 @@ best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=265151
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -210,7 +210,7 @@ best_effort_timestamp_time=0.040000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=495575
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......@@ -315,7 +315,7 @@ best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=529729
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -354,7 +354,7 @@ best_effort_timestamp_time=0.080000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=760153
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......@@ -459,7 +459,7 @@ best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=794307
pkt_size=N/A
pkt_size=230400
width=320
height=240
pix_fmt=rgb24
......@@ -498,7 +498,7 @@ best_effort_timestamp_time=0.120000
pkt_duration=2048
pkt_duration_time=0.040000
pkt_pos=1024731
pkt_size=N/A
pkt_size=30000
width=100
height=100
pix_fmt=rgb24
......
tests/ref/fate/ffprobe_json
View file @ 77811482
......@@ -59,6 +59,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "2647",
"pkt_size": "230400",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
......@@ -97,6 +98,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "233068",
"pkt_size": "30000",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
......@@ -167,6 +169,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "265151",
"pkt_size": "230400",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
......@@ -205,6 +208,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "495575",
"pkt_size": "30000",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
......@@ -307,6 +311,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "529729",
"pkt_size": "230400",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
......@@ -345,6 +350,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "760153",
"pkt_size": "30000",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
......@@ -447,6 +453,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "794307",
"pkt_size": "230400",
"width": 320,
"height": 240,
"pix_fmt": "rgb24",
......@@ -485,6 +492,7 @@
"pkt_duration": 2048,
"pkt_duration_time": "0.040000",
"pkt_pos": "1024731",
"pkt_size": "30000",
"width": 100,
"height": 100,
"pix_fmt": "rgb24",
......
tests/ref/fate/ffprobe_xml
View file @ 77811482
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment