January 2017 - ffmpeg-cvslog - lists.ffmpeg.org

Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2'
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Clément Bœsch <cboesch(a)gopro.com> | Tue Jan 31 17:35:41 2017 +0100| [126e96533f4526fc84fa68f3023d991622e287d3] | committer: Clément Bœsch Merge commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2' * commit '9833a406d3d743d238e4cbee08ffcaa12e067dd2': examples: Properly free AVCodecContext Merged-by: Clément Bœsch <cboesch(a)gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=126e96533f4526fc8… --- doc/examples/decoding_encoding.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c index 43a64c2..1c5a78a 100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@ -232,8 +232,7 @@ static void audio_encode_example(const char *filename) av_freep(&samples); av_frame_free(&frame); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); } /* @@ -336,8 +335,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) fclose(outfile); fclose(f); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); av_frame_free(&decoded_frame); } @@ -479,8 +477,7 @@ static void video_encode_example(const char *filename, int codec_id) fwrite(endcode, 1, sizeof(endcode), f); fclose(f); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); av_freep(&frame->data[0]); av_frame_free(&frame); printf("\n"); @@ -622,8 +619,7 @@ static void video_decode_example(const char *outfilename, const char *filename) fclose(f); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); av_frame_free(&frame); printf("\n"); } ====================================================================== diff --cc doc/examples/decoding_encoding.c index 43a64c2,0000000..1c5a78a mode 100644,000000..100644 --- a/doc/examples/decoding_encoding.c +++ b/doc/examples/decoding_encoding.c @@@ -1,665 -1,0 +1,661 @@@ +/* + * Copyright (c) 2001 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * @file + * libavcodec API use example. + * + * @example decoding_encoding.c + * Note that libavcodec only handles codecs (MPEG, MPEG-4, etc...), + * not file formats (AVI, VOB, MP4, MOV, MKV, MXF, FLV, MPEG-TS, MPEG-PS, etc...). + * See library 'libavformat' for the format handling + */ + +#include <math.h> + +#include <libavutil/opt.h> +#include <libavcodec/avcodec.h> +#include <libavutil/channel_layout.h> +#include <libavutil/common.h> +#include <libavutil/imgutils.h> +#include <libavutil/mathematics.h> +#include <libavutil/samplefmt.h> + +#define INBUF_SIZE 4096 +#define AUDIO_INBUF_SIZE 20480 +#define AUDIO_REFILL_THRESH 4096 + +/* check that a given sample format is supported by the encoder */ +static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt) +{ + const enum AVSampleFormat *p = codec->sample_fmts; + + while (*p != AV_SAMPLE_FMT_NONE) { + if (*p == sample_fmt) + return 1; + p++; + } + return 0; +} + +/* just pick the highest supported samplerate */ +static int select_sample_rate(AVCodec *codec) +{ + const int *p; + int best_samplerate = 0; + + if (!codec->supported_samplerates) + return 44100; + + p = codec->supported_samplerates; + while (*p) { + best_samplerate = FFMAX(*p, best_samplerate); + p++; + } + return best_samplerate; +} + +/* select layout with the highest channel count */ +static int select_channel_layout(AVCodec *codec) +{ + const uint64_t *p; + uint64_t best_ch_layout = 0; + int best_nb_channels = 0; + + if (!codec->channel_layouts) + return AV_CH_LAYOUT_STEREO; + + p = codec->channel_layouts; + while (*p) { + int nb_channels = av_get_channel_layout_nb_channels(*p); + + if (nb_channels > best_nb_channels) { + best_ch_layout = *p; + best_nb_channels = nb_channels; + } + p++; + } + return best_ch_layout; +} + +/* + * Audio encoding example + */ +static void audio_encode_example(const char *filename) +{ + AVCodec *codec; + AVCodecContext *c= NULL; + AVFrame *frame; + AVPacket pkt; + int i, j, k, ret, got_output; + int buffer_size; + FILE *f; + uint16_t *samples; + float t, tincr; + + printf("Encode audio file %s\n", filename); + + /* find the MP2 encoder */ + codec = avcodec_find_encoder(AV_CODEC_ID_MP2); + if (!codec) { + fprintf(stderr, "Codec not found\n"); + exit(1); + } + + c = avcodec_alloc_context3(codec); + if (!c) { + fprintf(stderr, "Could not allocate audio codec context\n"); + exit(1); + } + + /* put sample parameters */ + c->bit_rate = 64000; + + /* check that the encoder supports s16 pcm input */ + c->sample_fmt = AV_SAMPLE_FMT_S16; + if (!check_sample_fmt(codec, c->sample_fmt)) { + fprintf(stderr, "Encoder does not support sample format %s", + av_get_sample_fmt_name(c->sample_fmt)); + exit(1); + } + + /* select other audio parameters supported by the encoder */ + c->sample_rate = select_sample_rate(codec); + c->channel_layout = select_channel_layout(codec); + c->channels = av_get_channel_layout_nb_channels(c->channel_layout); + + /* open it */ + if (avcodec_open2(c, codec, NULL) < 0) { + fprintf(stderr, "Could not open codec\n"); + exit(1); + } + + f = fopen(filename, "wb"); + if (!f) { + fprintf(stderr, "Could not open %s\n", filename); + exit(1); + } + + /* frame containing input raw audio */ + frame = av_frame_alloc(); + if (!frame) { + fprintf(stderr, "Could not allocate audio frame\n"); + exit(1); + } + + frame->nb_samples = c->frame_size; + frame->format = c->sample_fmt; + frame->channel_layout = c->channel_layout; + + /* the codec gives us the frame size, in samples, + * we calculate the size of the samples buffer in bytes */ + buffer_size = av_samples_get_buffer_size(NULL, c->channels, c->frame_size, + c->sample_fmt, 0); + if (buffer_size < 0) { + fprintf(stderr, "Could not get sample buffer size\n"); + exit(1); + } + samples = av_malloc(buffer_size); + if (!samples) { + fprintf(stderr, "Could not allocate %d bytes for samples buffer\n", + buffer_size); + exit(1); + } + /* setup the data pointers in the AVFrame */ + ret = avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt, + (const uint8_t*)samples, buffer_size, 0); + if (ret < 0) { + fprintf(stderr, "Could not setup audio frame\n"); + exit(1); + } + + /* encode a single tone sound */ + t = 0; + tincr = 2 * M_PI * 440.0 / c->sample_rate; + for (i = 0; i < 200; i++) { + av_init_packet(&pkt); + pkt.data = NULL; // packet data will be allocated by the encoder + pkt.size = 0; + + for (j = 0; j < c->frame_size; j++) { + samples[2*j] = (int)(sin(t) * 10000); + + for (k = 1; k < c->channels; k++) + samples[2*j + k] = samples[2*j]; + t += tincr; + } + /* encode the samples */ + ret = avcodec_encode_audio2(c, &pkt, frame, &got_output); + if (ret < 0) { + fprintf(stderr, "Error encoding audio frame\n"); + exit(1); + } + if (got_output) { + fwrite(pkt.data, 1, pkt.size, f); + av_packet_unref(&pkt); + } + } + + /* get the delayed frames */ + for (got_output = 1; got_output; i++) { + ret = avcodec_encode_audio2(c, &pkt, NULL, &got_output); + if (ret < 0) { + fprintf(stderr, "Error encoding frame\n"); + exit(1); + } + + if (got_output) { + fwrite(pkt.data, 1, pkt.size, f); + av_packet_unref(&pkt); + } + } + fclose(f); + + av_freep(&samples); + av_frame_free(&frame); - avcodec_close(c); - av_free(c); ++ avcodec_free_context(&c); +} + +/* + * Audio decoding. + */ +static void audio_decode_example(const char *outfilename, const char *filename) +{ + AVCodec *codec; + AVCodecContext *c= NULL; + int len; + FILE *f, *outfile; + uint8_t inbuf[AUDIO_INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; + AVPacket avpkt; + AVFrame *decoded_frame = NULL; + + av_init_packet(&avpkt); + + printf("Decode audio file %s to %s\n", filename, outfilename); + + /* find the MPEG audio decoder */ + codec = avcodec_find_decoder(AV_CODEC_ID_MP2); + if (!codec) { + fprintf(stderr, "Codec not found\n"); + exit(1); + } + + c = avcodec_alloc_context3(codec); + if (!c) { + fprintf(stderr, "Could not allocate audio codec context\n"); + exit(1); + } + + /* open it */ + if (avcodec_open2(c, codec, NULL) < 0) { + fprintf(stderr, "Could not open codec\n"); + exit(1); + } + + f = fopen(filename, "rb"); + if (!f) { + fprintf(stderr, "Could not open %s\n", filename); + exit(1); + } + outfile = fopen(outfilename, "wb"); + if (!outfile) { + av_free(c); + exit(1); + } + + /* decode until eof */ + avpkt.data = inbuf; + avpkt.size = fread(inbuf, 1, AUDIO_INBUF_SIZE, f); + + while (avpkt.size > 0) { + int i, ch; + int got_frame = 0; + + if (!decoded_frame) { + if (!(decoded_frame = av_frame_alloc())) { + fprintf(stderr, "Could not allocate audio frame\n"); + exit(1); + } + } + + len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); + if (len < 0) { + fprintf(stderr, "Error while decoding\n"); + exit(1); + } + if (got_frame) { + /* if a frame has been decoded, output it */ + int data_size = av_get_bytes_per_sample(c->sample_fmt); + if (data_size < 0) { + /* This should not occur, checking just for paranoia */ + fprintf(stderr, "Failed to calculate data size\n"); + exit(1); + } + for (i=0; i<decoded_frame->nb_samples; i++) + for (ch=0; ch<c->channels; ch++) + fwrite(decoded_frame->data[ch] + data_size*i, 1, data_size, outfile); + } + avpkt.size -= len; + avpkt.data += len; + avpkt.dts = + avpkt.pts = AV_NOPTS_VALUE; + if (avpkt.size < AUDIO_REFILL_THRESH) { + /* Refill the input buffer, to avoid trying to decode + * incomplete frames. Instead of this, one could also use + * a parser, or use a proper container format through + * libavformat. */ + memmove(inbuf, avpkt.data, avpkt.size); + avpkt.data = inbuf; + len = fread(avpkt.data + avpkt.size, 1, + AUDIO_INBUF_SIZE - avpkt.size, f); + if (len > 0) + avpkt.size += len; + } + } + + fclose(outfile); + fclose(f); + - avcodec_close(c); - av_free(c); ++ avcodec_free_context(&c); + av_frame_free(&decoded_frame); +} + +/* + * Video encoding example + */ +static void video_encode_example(const char *filename, int codec_id) +{ + AVCodec *codec; + AVCodecContext *c= NULL; + int i, ret, x, y, got_output; + FILE *f; + AVFrame *frame; + AVPacket pkt; + uint8_t endcode[] = { 0, 0, 1, 0xb7 }; + + printf("Encode video file %s\n", filename); + + /* find the video encoder */ + codec = avcodec_find_encoder(codec_id); + if (!codec) { + fprintf(stderr, "Codec not found\n"); + exit(1); + } + + c = avcodec_alloc_context3(codec); + if (!c) { + fprintf(stderr, "Could not allocate video codec context\n"); + exit(1); + } + + /* put sample parameters */ + c->bit_rate = 400000; + /* resolution must be a multiple of two */ + c->width = 352; + c->height = 288; + /* frames per second */ + c->time_base = (AVRational){1,25}; + /* emit one intra frame every ten frames + * check frame pict_type before passing frame + * to encoder, if frame->pict_type is AV_PICTURE_TYPE_I + * then gop_size is ignored and the output of encoder + * will always be I frame irrespective to gop_size + */ + c->gop_size = 10; + c->max_b_frames = 1; + c->pix_fmt = AV_PIX_FMT_YUV420P; + + if (codec_id == AV_CODEC_ID_H264) + av_opt_set(c->priv_data, "preset", "slow", 0); + + /* open it */ + if (avcodec_open2(c, codec, NULL) < 0) { + fprintf(stderr, "Could not open codec\n"); + exit(1); + } + + f = fopen(filename, "wb"); + if (!f) { + fprintf(stderr, "Could not open %s\n", filename); + exit(1); + } + + frame = av_frame_alloc(); + if (!frame) { + fprintf(stderr, "Could not allocate video frame\n"); + exit(1); + } + frame->format = c->pix_fmt; + frame->width = c->width; + frame->height = c->height; + + /* the image can be allocated by any means and av_image_alloc() is + * just the most convenient way if av_malloc() is to be used */ + ret = av_image_alloc(frame->data, frame->linesize, c->width, c->height, + c->pix_fmt, 32); + if (ret < 0) { + fprintf(stderr, "Could not allocate raw picture buffer\n"); + exit(1); + } + + /* encode 1 second of video */ + for (i = 0; i < 25; i++) { + av_init_packet(&pkt); + pkt.data = NULL; // packet data will be allocated by the encoder + pkt.size = 0; + + fflush(stdout); + /* prepare a dummy image */ + /* Y */ + for (y = 0; y < c->height; y++) { + for (x = 0; x < c->width; x++) { + frame->data[0][y * frame->linesize[0] + x] = x + y + i * 3; + } + } + + /* Cb and Cr */ + for (y = 0; y < c->height/2; y++) { + for (x = 0; x < c->width/2; x++) { + frame->data[1][y * frame->linesize[1] + x] = 128 + y + i * 2; + frame->data[2][y * frame->linesize[2] + x] = 64 + x + i * 5; + } + } + + frame->pts = i; + + /* encode the image */ + ret = avcodec_encode_video2(c, &pkt, frame, &got_output); + if (ret < 0) { + fprintf(stderr, "Error encoding frame\n"); + exit(1); + } + + if (got_output) { + printf("Write frame %3d (size=%5d)\n", i, pkt.size); + fwrite(pkt.data, 1, pkt.size, f); + av_packet_unref(&pkt); + } + } + + /* get the delayed frames */ + for (got_output = 1; got_output; i++) { + fflush(stdout); + + ret = avcodec_encode_video2(c, &pkt, NULL, &got_output); + if (ret < 0) { + fprintf(stderr, "Error encoding frame\n"); + exit(1); + } + + if (got_output) { + printf("Write frame %3d (size=%5d)\n", i, pkt.size); + fwrite(pkt.data, 1, pkt.size, f); + av_packet_unref(&pkt); + } + } + + /* add sequence end code to have a real MPEG file */ + fwrite(endcode, 1, sizeof(endcode), f); + fclose(f); + - avcodec_close(c); - av_free(c); ++ avcodec_free_context(&c); + av_freep(&frame->data[0]); + av_frame_free(&frame); + printf("\n"); +} + +/* + * Video decoding example + */ + +static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize, + char *filename) +{ + FILE *f; + int i; + + f = fopen(filename,"w"); + fprintf(f, "P5\n%d %d\n%d\n", xsize, ysize, 255); + for (i = 0; i < ysize; i++) + fwrite(buf + i * wrap, 1, xsize, f); + fclose(f); +} + +static int decode_write_frame(const char *outfilename, AVCodecContext *avctx, + AVFrame *frame, int *frame_count, AVPacket *pkt, int last) +{ + int len, got_frame; + char buf[1024]; + + len = avcodec_decode_video2(avctx, frame, &got_frame, pkt); + if (len < 0) { + fprintf(stderr, "Error while decoding frame %d\n", *frame_count); + return len; + } + if (got_frame) { + printf("Saving %sframe %3d\n", last ? "last " : "", *frame_count); + fflush(stdout); + + /* the picture is allocated by the decoder, no need to free it */ + snprintf(buf, sizeof(buf), outfilename, *frame_count); + pgm_save(frame->data[0], frame->linesize[0], + frame->width, frame->height, buf); + (*frame_count)++; + } + if (pkt->data) { + pkt->size -= len; + pkt->data += len; + } + return 0; +} + +static void video_decode_example(const char *outfilename, const char *filename) +{ + AVCodec *codec; + AVCodecContext *c= NULL; + int frame_count; + FILE *f; + AVFrame *frame; + uint8_t inbuf[INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; + AVPacket avpkt; + + av_init_packet(&avpkt); + + /* set end of buffer to 0 (this ensures that no overreading happens for damaged MPEG streams) */ + memset(inbuf + INBUF_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + printf("Decode video file %s to %s\n", filename, outfilename); + + /* find the MPEG-1 video decoder */ + codec = avcodec_find_decoder(AV_CODEC_ID_MPEG1VIDEO); + if (!codec) { + fprintf(stderr, "Codec not found\n"); + exit(1); + } + + c = avcodec_alloc_context3(codec); + if (!c) { + fprintf(stderr, "Could not allocate video codec context\n"); + exit(1); + } + + if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) + c->flags |= AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames + + /* For some codecs, such as msmpeg4 and mpeg4, width and height + MUST be initialized there because this information is not + available in the bitstream. */ + + /* open it */ + if (avcodec_open2(c, codec, NULL) < 0) { + fprintf(stderr, "Could not open codec\n"); + exit(1); + } + + f = fopen(filename, "rb"); + if (!f) { + fprintf(stderr, "Could not open %s\n", filename); + exit(1); + } + + frame = av_frame_alloc(); + if (!frame) { + fprintf(stderr, "Could not allocate video frame\n"); + exit(1); + } + + frame_count = 0; + for (;;) { + avpkt.size = fread(inbuf, 1, INBUF_SIZE, f); + if (avpkt.size == 0) + break; + + /* NOTE1: some codecs are stream based (mpegvideo, mpegaudio) + and this is the only method to use them because you cannot + know the compressed data size before analysing it. + + BUT some other codecs (msmpeg4, mpeg4) are inherently frame + based, so you must call them with all the data for one + frame exactly. You must also initialize 'width' and + 'height' before initializing them. */ + + /* NOTE2: some codecs allow the raw parameters (frame size, + sample rate) to be changed at any frame. We handle this, so + you should also take care of it */ + + /* here, we use a stream based decoder (mpeg1video), so we + feed decoder and see if it could decode a frame */ + avpkt.data = inbuf; + while (avpkt.size > 0) + if (decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 0) < 0) + exit(1); + } + + /* Some codecs, such as MPEG, transmit the I- and P-frame with a + latency of one frame. You must do the following to have a + chance to get the last frame of the video. */ + avpkt.data = NULL; + avpkt.size = 0; + decode_write_frame(outfilename, c, frame, &frame_count, &avpkt, 1); + + fclose(f); + - avcodec_close(c); - av_free(c); ++ avcodec_free_context(&c); + av_frame_free(&frame); + printf("\n"); +} + +int main(int argc, char **argv) +{ + const char *output_type; + + /* register all the codecs */ + avcodec_register_all(); + + if (argc < 2) { + printf("usage: %s output_type\n" + "API example program to decode/encode a media stream with libavcodec.\n" + "This program generates a synthetic stream and encodes it to a file\n" + "named test.h264, test.mp2 or test.mpg depending on output_type.\n" + "The encoded stream is then decoded and written to a raw data output.\n" + "output_type must be chosen between 'h264', 'mp2', 'mpg'.\n", + argv[0]); + return 1; + } + output_type = argv[1]; + + if (!strcmp(output_type, "h264")) { + video_encode_example("test.h264", AV_CODEC_ID_H264); + } else if (!strcmp(output_type, "mp2")) { + audio_encode_example("test.mp2"); + audio_decode_example("test.pcm", "test.mp2"); + } else if (!strcmp(output_type, "mpg")) { + video_encode_example("test.mpg", AV_CODEC_ID_MPEG1VIDEO); + video_decode_example("test%02d.pgm", "test.mpg"); + } else { + fprintf(stderr, "Invalid output type '%s', choose between 'h264', 'mp2', or 'mpg'\n", + output_type); + return 1; + } + + return 0; +}

1 0

examples: Properly free AVCodecContext
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Wed Jul 20 16:10:17 2016 +0200| [9833a406d3d743d238e4cbee08ffcaa12e067dd2] | committer: Vittorio Giovara examples: Properly free AVCodecContext > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9833a406d3d743d23… --- doc/examples/avcodec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/doc/examples/avcodec.c b/doc/examples/avcodec.c index f8d043f..8fee552 100644 --- a/doc/examples/avcodec.c +++ b/doc/examples/avcodec.c @@ -213,8 +213,7 @@ static void audio_encode_example(const char *filename) av_freep(&samples); av_frame_free(&frame); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); } /* @@ -305,8 +304,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) fclose(outfile); fclose(f); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); av_frame_free(&decoded_frame); } @@ -428,8 +426,7 @@ static void video_encode_example(const char *filename) fwrite(endcode, 1, sizeof(endcode), f); fclose(f); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); av_freep(&picture->data[0]); av_frame_free(&picture); printf("\n"); @@ -565,8 +562,7 @@ static void video_decode_example(const char *outfilename, const char *filename) fclose(f); - avcodec_close(c); - av_free(c); + avcodec_free_context(&c); av_frame_free(&picture); printf("\n"); }

1 0

Merge commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb'
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Clément Bœsch <cboesch(a)gopro.com> | Tue Jan 31 17:32:03 2017 +0100| [591cf8aa0ee9e09aac29861f4229616df7604172] | committer: Clément Bœsch Merge commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb' * commit '0e0538aefc75958ded49f5d075c99a81cf6b2bbb': avprobe: Zero the allocated avio buffer memory This commit is a noop, no such thing exists in ffprobe. Merged-by: Clément Bœsch <cboesch(a)gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=591cf8aa0ee9e09aa… ---

1 0

avprobe: Zero the allocated avio buffer memory
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Wed Jul 20 15:44:10 2016 +0200| [0e0538aefc75958ded49f5d075c99a81cf6b2bbb] | committer: Vittorio Giovara avprobe: Zero the allocated avio buffer memory Fixes valgrind warning "Conditional jump or move depends on uninitialised value(s)." from avio_flush(). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e0538aefc75958de… --- avprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avprobe.c b/avprobe.c index abaaee1..5b9a7ec 100644 --- a/avprobe.c +++ b/avprobe.c @@ -1039,7 +1039,7 @@ static int probe_buf_write(void *opaque, uint8_t *buf, int buf_size) int main(int argc, char **argv) { int ret; - uint8_t *buffer = av_malloc(AVP_BUFFSIZE); + uint8_t *buffer = av_mallocz(AVP_BUFFSIZE); if (!buffer) exit(1);

1 0

Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d'
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Clément Bœsch <cboesch(a)gopro.com> | Tue Jan 31 17:27:46 2017 +0100| [b9292a9698375510c5668cde4ce80dea79d8ec02] | committer: Clément Bœsch Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d' * commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d': libdc1394: Fill in packet data directly Merged-by: Clément Bœsch <cboesch(a)gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9292a9698375510c… --- libavdevice/libdc1394.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 60c6146..c5fdd10 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -69,7 +69,8 @@ typedef struct dc1394_data { char *pixel_format; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */ - AVPacket packet; + int size; + int stream_index; } dc1394_data; static const struct dc1394_frame_format { @@ -178,16 +179,13 @@ static inline int dc1394_read_common(AVFormatContext *c, vst->codecpar->format = fmt->pix_fmt; vst->avg_frame_rate = framerate; - /* packet init */ - av_init_packet(&dc1394->packet); - dc1394->packet.size = av_image_get_buffer_size(fmt->pix_fmt, - fmt->width, fmt->height, 1); - dc1394->packet.stream_index = vst->index; - dc1394->packet.flags |= AV_PKT_FLAG_KEY; - dc1394->current_frame = 0; + dc1394->stream_index = vst->index; + dc1394->size = av_image_get_buffer_size(fmt->pix_fmt, + fmt->width, fmt->height, 1); - vst->codecpar->bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000); + vst->codecpar->bit_rate = av_rescale(dc1394->size * 8, + fps->frame_rate, 1000); *select_fps = fps; *select_fmt = fmt; out: @@ -263,17 +261,17 @@ static int dc1394_v1_read_packet(AVFormatContext *c, AVPacket *pkt) res = dc1394_dma_single_capture(&dc1394->camera); if (res == DC1394_SUCCESS) { - dc1394->packet.data = (uint8_t *)(dc1394->camera.capture_buffer); - dc1394->packet.pts = (dc1394->current_frame * 1000000) / dc1394->frame_rate; - res = dc1394->packet.size; + pkt->data = (uint8_t *)dc1394->camera.capture_buffer; + pkt->size = dc1394->size; + pkt->pts = (dc1394->current_frame * 1000000) / dc1394->frame_rate; + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->stream_index = dc1394->stream_index; } else { av_log(c, AV_LOG_ERROR, "DMA capture failed\n"); - dc1394->packet.data = NULL; - res = -1; + return AVERROR_INVALIDDATA; } - *pkt = dc1394->packet; - return res; + return pkt->size; } static int dc1394_v1_close(AVFormatContext * context) @@ -380,17 +378,17 @@ static int dc1394_v2_read_packet(AVFormatContext *c, AVPacket *pkt) res = dc1394_capture_dequeue(dc1394->camera, DC1394_CAPTURE_POLICY_WAIT, &dc1394->frame); if (res == DC1394_SUCCESS) { - dc1394->packet.data = (uint8_t *) dc1394->frame->image; - dc1394->packet.pts = dc1394->current_frame * 1000000 / dc1394->frame_rate; - res = dc1394->frame->image_bytes; + pkt->data = (uint8_t *)dc1394->frame->image; + pkt->size = dc1394->frame->image_bytes; + pkt->pts = dc1394->current_frame * 1000000 / dc1394->frame_rate; + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->stream_index = dc1394->stream_index; } else { av_log(c, AV_LOG_ERROR, "DMA capture failed\n"); - dc1394->packet.data = NULL; - res = -1; + return AVERROR_INVALIDDATA; } - *pkt = dc1394->packet; - return res; + return pkt->size; } static int dc1394_v2_close(AVFormatContext * context) ====================================================================== diff --cc libavdevice/libdc1394.c index 60c6146,a0ea592..c5fdd10 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@@ -69,10 -69,11 +69,11 @@@ typedef struct dc1394_data char *pixel_format; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */ - AVPacket packet; + int size; + int stream_index; } dc1394_data; -struct dc1394_frame_format { +static const struct dc1394_frame_format { int width; int height; enum AVPixelFormat pix_fmt;

1 0

libdc1394: Fill in packet data directly
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Wed Jul 13 12:56:51 2016 -0400| [5d0f85f1b2469b60d0838330aabe5353fdd9ef1d] | committer: Vittorio Giovara libdc1394: Fill in packet data directly Drop the packet embedded in the context. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d0f85f1b2469b60d… --- libavdevice/libdc1394.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 72e2e8b..a0ea592 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -69,7 +69,8 @@ typedef struct dc1394_data { char *pixel_format; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */ - AVPacket packet; + int size; + int stream_index; } dc1394_data; struct dc1394_frame_format { @@ -177,16 +178,13 @@ static inline int dc1394_read_common(AVFormatContext *c, vst->codecpar->format = fmt->pix_fmt; vst->avg_frame_rate = framerate; - /* packet init */ - av_init_packet(&dc1394->packet); - dc1394->packet.size = av_image_get_buffer_size(fmt->pix_fmt, - fmt->width, fmt->height, 1); - dc1394->packet.stream_index = vst->index; - dc1394->packet.flags |= AV_PKT_FLAG_KEY; - dc1394->current_frame = 0; + dc1394->stream_index = vst->index; + dc1394->size = av_image_get_buffer_size(fmt->pix_fmt, + fmt->width, fmt->height, 1); - vst->codecpar->bit_rate = av_rescale(dc1394->packet.size * 8, fps->frame_rate, 1000); + vst->codecpar->bit_rate = av_rescale(dc1394->size * 8, + fps->frame_rate, 1000); *select_fps = fps; *select_fmt = fmt; out: @@ -262,17 +260,17 @@ static int dc1394_v1_read_packet(AVFormatContext *c, AVPacket *pkt) res = dc1394_dma_single_capture(&dc1394->camera); if (res == DC1394_SUCCESS) { - dc1394->packet.data = (uint8_t *)(dc1394->camera.capture_buffer); - dc1394->packet.pts = (dc1394->current_frame * 1000000) / dc1394->frame_rate; - res = dc1394->packet.size; + pkt->data = (uint8_t *)dc1394->camera.capture_buffer; + pkt->size = dc1394->size; + pkt->pts = (dc1394->current_frame * 1000000) / dc1394->frame_rate; + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->stream_index = dc1394->stream_index; } else { av_log(c, AV_LOG_ERROR, "DMA capture failed\n"); - dc1394->packet.data = NULL; - res = -1; + return AVERROR_INVALIDDATA; } - *pkt = dc1394->packet; - return res; + return pkt->size; } static int dc1394_v1_close(AVFormatContext * context) @@ -374,17 +372,17 @@ static int dc1394_v2_read_packet(AVFormatContext *c, AVPacket *pkt) res = dc1394_capture_dequeue(dc1394->camera, DC1394_CAPTURE_POLICY_WAIT, &dc1394->frame); if (res == DC1394_SUCCESS) { - dc1394->packet.data = (uint8_t *) dc1394->frame->image; - dc1394->packet.pts = dc1394->current_frame * 1000000 / dc1394->frame_rate; - res = dc1394->frame->image_bytes; + pkt->data = (uint8_t *)dc1394->frame->image; + pkt->size = dc1394->frame->image_bytes; + pkt->pts = dc1394->current_frame * 1000000 / dc1394->frame_rate; + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->stream_index = dc1394->stream_index; } else { av_log(c, AV_LOG_ERROR, "DMA capture failed\n"); - dc1394->packet.data = NULL; - res = -1; + return AVERROR_INVALIDDATA; } - *pkt = dc1394->packet; - return res; + return pkt->size; } static int dc1394_v2_close(AVFormatContext * context)

1 0

Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c'
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Clément Bœsch <cboesch(a)gopro.com> | Tue Jan 31 17:26:26 2017 +0100| [fa02765886294b07a1553570d5c9b5757a78e7f0] | committer: Clément Bœsch Merge commit 'e344e65109f1a75ca82aff4cecec44e79197753c' * commit 'e344e65109f1a75ca82aff4cecec44e79197753c': h264dec: do not call finish_setup() if we have not started a frame This commit is a noop, see bdbbb8f11edbf10add874508c5125c174d8939be Merged-by: Clément Bœsch <cboesch(a)gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa02765886294b07a… ---

1 0

h264dec: do not call finish_setup() if we have not started a frame
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jul 20 09:41:35 2016 +0200| [e344e65109f1a75ca82aff4cecec44e79197753c] | committer: Anton Khirnov h264dec: do not call finish_setup() if we have not started a frame Found-By: Jan Ruge <jan.s.ruge(a)gmail.com> Bug-Id: 952 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e344e65109f1a75ca… --- libavcodec/h264dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 4d1702e..0e318a5 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -557,7 +557,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) break; if (avctx->active_thread_type & FF_THREAD_FRAME && !h->avctx->hwaccel && - i >= nals_needed && !h->setup_finished) { + i >= nals_needed && !h->setup_finished && h->cur_pic_ptr) { ff_thread_finish_setup(avctx); h->setup_finished = 1; }

1 0

Merge commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4'
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Clément Bœsch <cboesch(a)gopro.com> | Tue Jan 31 17:17:21 2017 +0100| [4039076dc39a530f29969b6f42083a03215c6aa5] | committer: Clément Bœsch Merge commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4' * commit '76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4': h264dec: handle zero-sized NAL units in get_last_needed_nal() See 641dccc2aa5e0bf6b3c06998f9a7f24a5cf725e7 Merged-by: Clément Bœsch <cboesch(a)gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4039076dc39a530f2… --- libavcodec/h264dec.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 0994b83..41c0964 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -537,8 +537,7 @@ static int get_last_needed_nal(H264Context *h) { int nals_needed = 0; int first_slice = 0; - int i; - int ret; + int i, ret; for (i = 0; i < h->pkt.nb_nals; i++) { H2645NAL *nal = &h->pkt.nals[i]; @@ -556,9 +555,14 @@ static int get_last_needed_nal(H264Context *h) case H264_NAL_DPA: case H264_NAL_IDR_SLICE: case H264_NAL_SLICE: - ret = init_get_bits8(&gb, nal->data + 1, (nal->size - 1)); - if (ret < 0) - return ret; + ret = init_get_bits8(&gb, nal->data + 1, nal->size - 1); + if (ret < 0) { + av_log(h->avctx, AV_LOG_ERROR, "Invalid zero-sized VCL NAL unit\n"); + if (h->avctx->err_recognition & AV_EF_EXPLODE) + return ret; + + break; + } if (!get_ue_golomb_long(&gb) || // first_mb_in_slice !first_slice || first_slice != nal->type) ====================================================================== diff --cc libavcodec/h264dec.c index 0994b83,4d1702e..41c0964 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@@ -536,9 -478,7 +536,8 @@@ static const uint8_t start_code[] = { 0 static int get_last_needed_nal(H264Context *h) { int nals_needed = 0; + int first_slice = 0; - int i; - int ret; + int i, ret; for (i = 0; i < h->pkt.nb_nals; i++) { H2645NAL *nal = &h->pkt.nals[i]; @@@ -556,15 -496,16 +555,20 @@@ case H264_NAL_DPA: case H264_NAL_IDR_SLICE: case H264_NAL_SLICE: - ret = init_get_bits8(&gb, nal->data + 1, (nal->size - 1)); - if (ret < 0) - return ret; + ret = init_get_bits8(&gb, nal->data + 1, nal->size - 1); + if (ret < 0) { + av_log(h->avctx, AV_LOG_ERROR, "Invalid zero-sized VCL NAL unit\n"); + if (h->avctx->err_recognition & AV_EF_EXPLODE) + return ret; + + break; + } - if (!get_ue_golomb(&gb)) + if (!get_ue_golomb_long(&gb) || // first_mb_in_slice + !first_slice || + first_slice != nal->type) nals_needed = i; + if (!first_slice) + first_slice = nal->type; } }

1 0

h264dec: handle zero-sized NAL units in get_last_needed_nal()
by git＠videolan.org 31 Jan '17

31 Jan '17

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jul 20 08:31:38 2016 +0200| [76f7e70aa04fc5dbef5242b11cbf8fe4499f61d4] | committer: Anton Khirnov h264dec: handle zero-sized NAL units in get_last_needed_nal() The current code will ignore the init_get_bits() failure and do an invalid read from the uninitialized GetBitContext. Found-By: Jan Ruge <jan.s.ruge(a)gmail.com> Bug-Id: 952 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76f7e70aa04fc5dbe… --- libavcodec/h264dec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index faa502e..4d1702e 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -478,7 +478,7 @@ static void flush_dpb(AVCodecContext *avctx) static int get_last_needed_nal(H264Context *h) { int nals_needed = 0; - int i; + int i, ret; for (i = 0; i < h->pkt.nb_nals; i++) { H2645NAL *nal = &h->pkt.nals[i]; @@ -496,7 +496,14 @@ static int get_last_needed_nal(H264Context *h) case H264_NAL_DPA: case H264_NAL_IDR_SLICE: case H264_NAL_SLICE: - init_get_bits(&gb, nal->data + 1, (nal->size - 1) * 8); + ret = init_get_bits8(&gb, nal->data + 1, nal->size - 1); + if (ret < 0) { + av_log(h->avctx, AV_LOG_ERROR, "Invalid zero-sized VCL NAL unit\n"); + if (h->avctx->err_recognition & AV_EF_EXPLODE) + return ret; + + break; + } if (!get_ue_golomb(&gb)) nals_needed = i; }

1 0