Browse Source

ffmpeg: move subframe warning to libavcodec

With the new decode API, doing this in ffmpeg.c is impractical. There
was resistance against removing the warning, so put it into libavcodec.

Not bothering with reducing the warning to verbose log level for
subsequent wanrings. The warning should be rare, and only happen when
developing new codecs for the old API.

Includes a change suggested by Michael Niedermayer.
tags/n3.2
wm4 8 years ago
parent
commit
b2fea2fdee
4 changed files with 7 additions and 8 deletions
  1. +0
    -7
      ffmpeg.c
  2. +0
    -1
      ffmpeg.h
  3. +1
    -0
      libavcodec/internal.h
  4. +6
    -0
      libavcodec/utils.c

+ 0
- 7
ffmpeg.c View File

@@ -2357,13 +2357,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
ist->pts = ist->next_pts;
ist->dts = ist->next_dts;

if (avpkt.size && avpkt.size != pkt->size &&
!(ist->dec->capabilities & AV_CODEC_CAP_SUBFRAMES)) {
av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE : AV_LOG_WARNING,
"Multiple frames in a packet from stream %d\n", pkt->stream_index);
ist->showed_multi_packet_warning = 1;
}

switch (ist->dec_ctx->codec_type) {
case AVMEDIA_TYPE_AUDIO:
ret = decode_audio (ist, &avpkt, &got_output);


+ 0
- 1
ffmpeg.h View File

@@ -287,7 +287,6 @@ typedef struct InputStream {

double ts_scale;
int saw_first_ts;
int showed_multi_packet_warning;
AVDictionary *decoder_opts;
AVRational framerate; /* framerate forced with -r */
int top_field_first;


+ 1
- 0
libavcodec/internal.h View File

@@ -173,6 +173,7 @@ typedef struct AVCodecInternal {
int buffer_pkt_valid; // encoding: packet without data can be valid
AVFrame *buffer_frame;
int draining_done;
int showed_multi_packet_warning;
} AVCodecInternal;

struct AVCodecDefault {


+ 6
- 0
libavcodec/utils.c View File

@@ -2461,6 +2461,12 @@ fail:

av_assert0(ret <= avpkt->size);

if (!avci->showed_multi_packet_warning &&
ret >= 0 && ret != avpkt->size && !(avctx->codec->capabilities & AV_CODEC_CAP_SUBFRAMES)) {
av_log(avctx, AV_LOG_WARNING, "Multiple frames in a packet.\n");
avci->showed_multi_packet_warning = 1;
}

return ret;
}



Loading…
Cancel
Save