History

avcodec/decode: simplify applying or exporting skip samples

Copy packet side data to the output frame in ff_decode_frame_props_from_pkt() instead of in discard_samples(), having the latter only applying the skip if required. This will be useful for the following commit.

James Almer committed 3 years ago

Commit 7db4c3e1 parent 78c52a81 file · +27 −32Browse files

Unified · Split

libavcodec/decode.c+27−32
@@ -293,26 +293,22 @@ static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *disca · 292 unmodified lines
293293 {
294294 AVCodecInternal *avci = avctx->internal;
295295 int ret = 0;
296− uint8_t *side;
297− size_t side_size;
296+ AVFrameSideData *side;
298297 uint32_t discard_padding = 0;
299298 uint8_t skip_reason = 0;
300299 uint8_t discard_reason = 0;
301300
302− side = av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size);
303− if (side && side_size >= 10) {
304− avci->skip_samples = AV_RL32(side);
301+ side = av_frame_get_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES);
302+ if (side && side->size >= 10) {
303+ avci->skip_samples = AV_RL32(side->data);
305304 avci->skip_samples = FFMAX(0, avci->skip_samples);
306− discard_padding = AV_RL32(side + 4);
305+ discard_padding = AV_RL32(side->data + 4);
307306 av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n",
308307 avci->skip_samples, (int)discard_padding);
309− skip_reason = AV_RL8(side + 8);
310− discard_reason = AV_RL8(side + 9);
308+ skip_reason = AV_RL8(side->data + 8);
309+ discard_reason = AV_RL8(side->data + 9);
311310 }
312311
313− if (!frame->buf[0])
314− return AVERROR(EAGAIN);
315−
316312 if (frame->format == AV_SAMPLE_FMT_NONE)
317313 frame->format = avctx->sample_fmt;
318314 if (!frame->ch_layout.nb_channels) {
@@ -333,15 +329,27 @@ FF_ENABLE_DEPRECATION_WARNINGS · 14 unmodified lines
333329 if (!frame->sample_rate)
334330 frame->sample_rate = avctx->sample_rate;
335331
336− if ((frame->flags & AV_FRAME_FLAG_DISCARD) &&
337− !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) {
332+ if ((avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) {
333+ if (!side && (avci->skip_samples || discard_padding))
334+ side = av_frame_new_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES, 10);
335+ if (side && (avci->skip_samples || discard_padding)) {
336+ AV_WL32(side->data, avci->skip_samples);
337+ AV_WL32(side->data + 4, discard_padding);
338+ AV_WL8(side->data + 8, skip_reason);
339+ AV_WL8(side->data + 9, discard_reason);
340+ avci->skip_samples = 0;
341+ }
342+ return ret;
343+ }
344+ av_frame_remove_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES);
345+
346+ if ((frame->flags & AV_FRAME_FLAG_DISCARD)) {
338347 avci->skip_samples = FFMAX(0, avci->skip_samples - frame->nb_samples);
339348 *discarded_samples += frame->nb_samples;
340349 return AVERROR(EAGAIN);
341350 }
342351
343− if (avci->skip_samples > 0 &&
344− !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) {
352+ if (avci->skip_samples > 0) {
345353 if (frame->nb_samples <= avci->skip_samples){
346354 *discarded_samples += frame->nb_samples;
347355 avci->skip_samples -= frame->nb_samples;
@@ -372,8 +380,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 24 unmodified lines
372380 }
373381 }
374382
375− if (discard_padding > 0 && discard_padding <= frame->nb_samples &&
376− !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) {
383+ if (discard_padding > 0 && discard_padding <= frame->nb_samples) {
377384 if (discard_padding == frame->nb_samples) {
378385 *discarded_samples += frame->nb_samples;
379386 return AVERROR(EAGAIN);
@@ -392,17 +399,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 12 unmodified lines
392399 }
393400 }
394401
395− if ((avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) {
396− AVFrameSideData *fside = av_frame_new_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES, 10);
397− if (fside) {
398− AV_WL32(fside->data, avci->skip_samples);
399− AV_WL32(fside->data + 4, discard_padding);
400− AV_WL8(fside->data + 8, skip_reason);
401− AV_WL8(fside->data + 9, discard_reason);
402− avci->skip_samples = 0;
403− }
404− }
405−
406402 return ret;
407403 }
408404
@@ -465,15 +461,13 @@ FF_ENABLE_DEPRECATION_WARNINGS · 56 unmodified lines
465461 }
466462 emms_c();
467463
468− if (!got_frame)
469− av_frame_unref(frame);
470−
471464 if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) {
472465 ret = (!got_frame || frame->flags & AV_FRAME_FLAG_DISCARD)
473466 ? AVERROR(EAGAIN)
474467 : 0;
475468 } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
476− ret = discard_samples(avctx, frame, discarded_samples);
469+ ret = !got_frame ? AVERROR(EAGAIN)
470+ : discard_samples(avctx, frame, discarded_samples);
477471 }
478472
479473 if (ret == AVERROR(EAGAIN))
@@ -1386,6 +1380,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, · 906 unmodified lines
13861380 { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE },
13871381 { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE },
13881382 { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS },
1383+ { AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES },
13891384 };
13901385
13911386 frame->pts = pkt->pts;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t