[FFmpeg-cvslog] lavc: add ff_bprint_to_extradata() helper and use it.
Clément Bœsch
git at videolan.org
Sun Dec 30 22:24:00 CET 2012
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sat Dec 29 22:09:59 2012 +0100| [36e61e24e7ac737b38c4382d439329352d9e0c29] | committer: Clément Bœsch
lavc: add ff_bprint_to_extradata() helper and use it.
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.
At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36e61e24e7ac737b38c4382d439329352d9e0c29
---
libavcodec/assdec.c | 3 ++-
libavcodec/assenc.c | 3 ++-
libavcodec/dvdsubenc.c | 5 +++--
libavcodec/internal.h | 5 +++++
libavcodec/utils.c | 19 +++++++++++++++++++
libavformat/assdec.c | 8 +++-----
libavformat/jacosubdec.c | 8 +++++---
libavformat/samidec.c | 9 +++------
libavformat/subviewerdec.c | 8 +++-----
9 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c
index 5a51703..d790656 100644
--- a/libavcodec/assdec.c
+++ b/libavcodec/assdec.c
@@ -29,10 +29,11 @@
static av_cold int ass_decode_init(AVCodecContext *avctx)
{
- avctx->subtitle_header = av_malloc(avctx->extradata_size);
+ avctx->subtitle_header = av_malloc(avctx->extradata_size + 1);
if (!avctx->subtitle_header)
return AVERROR(ENOMEM);
memcpy(avctx->subtitle_header, avctx->extradata, avctx->extradata_size);
+ avctx->subtitle_header[avctx->extradata_size] = 0;
avctx->subtitle_header_size = avctx->extradata_size;
avctx->priv_data = ff_ass_split(avctx->extradata);
if(!avctx->priv_data)
diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c
index 7ed21ee..50b89c0 100644
--- a/libavcodec/assenc.c
+++ b/libavcodec/assenc.c
@@ -28,11 +28,12 @@
static av_cold int ass_encode_init(AVCodecContext *avctx)
{
- avctx->extradata = av_malloc(avctx->subtitle_header_size);
+ avctx->extradata = av_malloc(avctx->subtitle_header_size + 1);
if (!avctx->extradata)
return AVERROR(ENOMEM);
memcpy(avctx->extradata, avctx->subtitle_header, avctx->subtitle_header_size);
avctx->extradata_size = avctx->subtitle_header_size;
+ avctx->extradata[avctx->extradata_size] = 0;
return 0;
}
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 2e0c37d..352272d 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -20,6 +20,7 @@
*/
#include "avcodec.h"
#include "bytestream.h"
+#include "internal.h"
#include "libavutil/avassert.h"
#include "libavutil/bprint.h"
#include "libavutil/imgutils.h"
@@ -408,9 +409,9 @@ static int dvdsub_init(AVCodecContext *avctx)
av_bprintf(&extradata, " %06"PRIx32"%c",
dvdc->global_palette[i] & 0xFFFFFF, i < 15 ? ',' : '\n');
- if ((ret = av_bprint_finalize(&extradata, (char **)&avctx->extradata)) < 0)
+ ret = ff_bprint_to_extradata(avctx, &extradata);
+ if (ret < 0)
return ret;
- avctx->extradata_size = extradata.len;
return 0;
}
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 2d3433f..386f6f3 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -201,4 +201,9 @@ int ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDict
*/
int ff_codec_close_recursive(AVCodecContext *avctx);
+/**
+ * Finalize buf into extradata and set its size appropriately.
+ */
+int ff_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf);
+
#endif /* AVCODEC_INTERNAL_H */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b366995..a275899 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -27,6 +27,7 @@
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
+#include "libavutil/bprint.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/mathematics.h"
@@ -2684,3 +2685,21 @@ int avcodec_is_open(AVCodecContext *s)
{
return !!s->internal;
}
+
+int ff_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf)
+{
+ int ret;
+ char *str;
+
+ ret = av_bprint_finalize(buf, &str);
+ if (ret < 0)
+ return ret;
+ avctx->extradata = str;
+ /* Note: the string is NUL terminated (so extradata can be read as a
+ * string), but the ending character is not accounted in the size (in
+ * binary formats you are likely not supposed to mux that character). When
+ * extradata is copied, it is also padded with FF_INPUT_BUFFER_PADDING_SIZE
+ * zeros. */
+ avctx->extradata_size = buf->len;
+ return 0;
+}
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 6c4614e..34229cb 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -22,6 +22,7 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
+#include "libavcodec/internal.h"
#include "libavutil/bprint.h"
typedef struct ASSContext{
@@ -132,12 +133,9 @@ static int ass_read_header(AVFormatContext *s)
av_bprint_finalize(&line, NULL);
- av_bprint_finalize(&header, (char **)&st->codec->extradata);
- if (!st->codec->extradata) {
- res = AVERROR(ENOMEM);
+ res = ff_bprint_to_extradata(st->codec, &header);
+ if (res < 0)
goto end;
- }
- st->codec->extradata_size = header.len + 1;
ff_subtitles_queue_finalize(&ass->q);
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c
index 1c58e3b..153da42 100644
--- a/libavformat/jacosubdec.c
+++ b/libavformat/jacosubdec.c
@@ -28,6 +28,7 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
+#include "libavcodec/internal.h"
#include "libavcodec/jacosub.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
@@ -159,7 +160,7 @@ static int jacosub_read_header(AVFormatContext *s)
JACOsubContext *jacosub = s->priv_data;
int shift_set = 0; // only the first shift matters
int merge_line = 0;
- int i;
+ int i, ret;
AVStream *st = avformat_new_stream(s, NULL);
if (!st)
@@ -228,8 +229,9 @@ static int jacosub_read_header(AVFormatContext *s)
}
/* general/essential directives in the extradata */
- av_bprint_finalize(&header, (char **)&st->codec->extradata);
- st->codec->extradata_size = header.len + 1;
+ ret = ff_bprint_to_extradata(st->codec, &header);
+ if (ret < 0)
+ return ret;
/* SHIFT and TIMERES affect the whole script so packet timing can only be
* done in a second pass */
diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index 85fd220..bdde2f4 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -27,6 +27,7 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
+#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "libavutil/intreadwrite.h"
@@ -91,13 +92,9 @@ static int sami_read_header(AVFormatContext *s)
av_bprint_clear(&buf);
}
- st->codec->extradata_size = hdr_buf.len + 1;
- av_bprint_finalize(&hdr_buf, (char **)&st->codec->extradata);
- if (!st->codec->extradata) {
- st->codec->extradata_size = 0;
- res = AVERROR(ENOMEM);
+ res = ff_bprint_to_extradata(st->codec, &hdr_buf);
+ if (res < 0)
goto end;
- }
ff_subtitles_queue_finalize(&sami->q);
diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c
index 7691d82..8ecc928 100644
--- a/libavformat/subviewerdec.c
+++ b/libavformat/subviewerdec.c
@@ -27,6 +27,7 @@
#include "avformat.h"
#include "internal.h"
#include "subtitles.h"
+#include "libavcodec/internal.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "libavutil/intreadwrite.h"
@@ -99,12 +100,9 @@ static int subviewer_read_header(AVFormatContext *s)
av_bprintf(&header, "%s", line);
if (!strncmp(line, "[END INFORMATION]", 17) || !strncmp(line, "[SUBTITLE]", 10)) {
/* end of header */
- av_bprint_finalize(&header, (char **)&st->codec->extradata);
- if (!st->codec->extradata) {
- res = AVERROR(ENOMEM);
+ res = ff_bprint_to_extradata(st->codec, &header);
+ if (res < 0)
goto end;
- }
- st->codec->extradata_size = header.len + 1;
} else if (strncmp(line, "[INFORMATION]", 13)) {
/* assume file metadata at this point */
int i, j = 0;
More information about the ffmpeg-cvslog
mailing list