August 2013 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] vdpau: Add an allocation function for AVVDPAUContext.
by Reimar Döffinger 11 Aug '13

11 Aug '13

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- doc/APIchanges | 4 ++++ libavcodec/vdpau.c | 5 +++++ libavcodec/vdpau.h | 10 +++++++++- libavcodec/version.h | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index dc40bc3..1c0a5ba 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-08-xx - xxxxxxx - lavc 55.25.100 - vdpau.h + Add allocation function for AVVDPAUContext, allowing + to extend it in the future without breaking ABI/API. + 2013-08-xx - xxxxxxx - lavc 55.13.0 - avcodec.h Deprecate the bitstream-related members from struct AVVDPAUContext. The bistream buffers no longer need to be explicitly freed. diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index cf564a5..63ea755 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -38,6 +38,11 @@ * @{ */ +AVVDPAUContext *av_alloc_vdpaucontext(void) +{ + return av_mallocz(sizeof(AVVDPAUContext)); +} + int ff_vdpau_common_start_frame(Picture *pic, av_unused const uint8_t *buffer, av_unused uint32_t size) diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 08116bf..210d517 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -73,7 +73,8 @@ union AVVDPAUPictureInfo { /** * This structure is used to share data between the libavcodec library and * the client video application. - * The user shall zero-allocate the structure and make it available as + * The user shall allocate the structure via the av_alloc_vdpau_hwaccel + * function and make it available as * AVCodecContext.hwaccel_context. Members can be set by the user once * during initialization or through each AVCodecContext.get_buffer() * function call. In any case, they must be valid prior to calling @@ -130,6 +131,13 @@ typedef struct AVVDPAUContext { #endif } AVVDPAUContext; +/** + * @brief allocation function for AVVDPAUContext + * + * Allows extending the struct without breaking API/ABI + */ +AVVDPAUContext *av_alloc_vdpaucontext(void); + #if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 diff --git a/libavcodec/version.h b/libavcodec/version.h index 75b15a7..ad8af90 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 24 +#define LIBAVCODEC_VERSION_MINOR 25 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- 1.8.4.rc1

2 2

[PATCH] vdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU.
by Reimar Döffinger 11 Aug '13

11 Aug '13

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- libavcodec/vdpau_internal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 001f17c..51d83d4 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -28,6 +28,7 @@ #include <vdpau/vdpau.h> #include "h264.h" #include "mpegvideo.h" +#include "vdpau.h" /** Extract VdpVideoSurface from a Picture */ static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic) -- 1.8.4.rc1

2 2

[PATCH] sanm: fix undefined behaviour on big-endian.
by Reimar Döffinger 11 Aug '13

11 Aug '13

A variable with post-increment may only appear once in a statement. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- libavcodec/sanm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index e6e866e..d1ef0ce 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1044,8 +1044,10 @@ static int decode_5(SANMVideoContext *ctx) #if HAVE_BIGENDIAN npixels = ctx->npixels; frm = ctx->frm0; - while (npixels--) - *frm++ = av_bswap16(*frm); + while (npixels--) { + *frm = av_bswap16(*frm); + frm++; + } #endif return 0; -- 1.8.4.rc1

2 2

[PATCH] tiff: continue parsing on non fatal errors
by Michael Niedermayer 11 Aug '13

11 Aug '13

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavcodec/tiff.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index f4ad773..2e06e3f 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -710,7 +710,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) { av_log(s->avctx, AV_LOG_DEBUG, "Unknown tiff type (%u) encountered\n", type); - return 0; + goto end; } if (count == 1) { @@ -928,7 +928,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) #define ADD_METADATA(count, name, sep)\ if ((ret = add_metadata(count, type, name, sep, s, frame)) < 0) {\ av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");\ - return ret;\ + goto end;\ } case TIFF_MODEL_PIXEL_SCALE: ADD_METADATA(count, "ModelPixelScaleTag", NULL); @@ -955,7 +955,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) if (!s->geotags) { av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n"); s->geotag_count = 0; - return AVERROR(ENOMEM); + goto end; } for (i = 0; i < s->geotag_count; i++) { s->geotags[i].key = tget_short(&s->gb, s->le); @@ -976,7 +976,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) dp = av_malloc(count * sizeof(double)); if (!dp) { av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n"); - return AVERROR(ENOMEM); + goto end; } for (i = 0; i < count; i++) dp[i] = tget_double(&s->gb, s->le); @@ -1064,6 +1064,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) return AVERROR_INVALIDDATA; } } +end: bytestream2_seek(&s->gb, start, SEEK_SET); return 0; } -- 1.7.9.5

2 2

FFmpeg 2.0.1
by Michael Niedermayer 11 Aug '13

11 Aug '13

Hi Ill make ffmpeg 2.0.1 soon if you want something backported, backport it now! -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Asymptotically faster algorithms should always be preferred if you have asymptotical amounts of data

3 5

[PATCH] avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCII
by Mark Harris 11 Aug '13

11 Aug '13

This makes the encoding of picture descriptions consistent with the encoding of other text id3 tags and works better with iTunes, which does not display pictures with some UTF-16 picture descriptions (including a UTF-16 empty string, i.e. BOM + terminator). It also saves a few bytes. Example: ffmpeg -f lavfi -i sine=b=4 -f lavfi -i smptebars -map 0:a -map 1:v \ -codec:a libmp3lame -codec:v mjpeg -id3v2_version 3 \ -metadata:s:v comment="Cover (front)" -t 3 -y out.mp3 This example does not set a picture description (-metadata:s:v title=) so an empty string is written in the id3v2.3 APIC frame. Without this patch, UTF-16 is used and the cover art does not display in iTunes. With the patch the cover art is displayed. (Note that iTunes does not display or have a way to set picture descriptions, only the picture itself, but nevertheless has trouble skipping some UTF-16 descriptions.) --- libavformat/id3v2enc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index f7c37eb..6052244 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -295,6 +295,10 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) if ((e = av_dict_get(st->metadata, "title", NULL, 0))) desc = e->value; + /* use UTF16 only for non-ASCII strings */ + if (enc == ID3v2_ENCODING_UTF16BOM && string_is_ascii(desc)) + enc = ID3v2_ENCODING_ISO8859; + /* start writing */ if (avio_open_dyn_buf(&dyn_buf) < 0) return AVERROR(ENOMEM); -- 1.8.3.4

2 1

[PATCH] Try to make new VDPAU usable by adding context to callback.
by Reimar Döffinger 11 Aug '13

11 Aug '13

Using VDPAU correctly means checking for preemption and possibly regenerating the context all the time. With the current API there is no context or other user-defined pointer and thus this in not possible unless using some hack like global variables. This introduces a new decode function that gets both the AVCodecContext and AVFrame in addition, in both the user can store additional opaque data. Unfortunately the HWAccel API has no way of providing API/ABI compatibility, so a currently disallowed state (render pointer being NULL) is used to extend it. An alloc function is added as well to ease future extensions. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- libavcodec/vdpau.c | 14 +++++++++++++- libavcodec/vdpau.h | 12 ++++++++++++ libavcodec/vdpau_h264.c | 7 ++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index cf564a5..27cc3a3 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -38,6 +38,13 @@ * @{ */ +AVVDPAUContext *av_alloc_vdpau_hwaccel(void) +{ + return av_mallocz(sizeof(AVVDPAUContext)); +} + +MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2) + int ff_vdpau_common_start_frame(Picture *pic, av_unused const uint8_t *buffer, av_unused uint32_t size) @@ -55,19 +62,24 @@ int ff_vdpau_common_start_frame(Picture *pic, CONFIG_VC1_VDPAU_HWACCEL || CONFIG_WMV3_VDPAU_HWACCEL int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx) { + int res = 0; AVVDPAUContext *hwctx = avctx->hwaccel_context; MpegEncContext *s = avctx->priv_data; Picture *pic = s->current_picture_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); + if (!hwctx->render) { + res = hwctx->render2(avctx, &pic->f, (void *)&pic_ctx->info, + pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); + } else hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); av_freep(&pic_ctx->bitstream_buffers); - return 0; + return res; } #endif diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 08116bf..8d89037 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -70,6 +70,13 @@ union AVVDPAUPictureInfo { }; #endif +struct AVCodecContext; +struct AVFrame; + +typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *, + const VdpPictureInfo *, uint32_t, + const VdpBitstreamBuffer *); + /** * This structure is used to share data between the libavcodec library and * the client video application. @@ -128,8 +135,13 @@ typedef struct AVVDPAUContext { attribute_deprecated VdpBitstreamBuffer *bitstream_buffers; #endif + AVVDPAU_Render2 render2; } AVVDPAUContext; +AVVDPAUContext *av_alloc_vdpau_hwaccel(void); +AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *); +void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); + #if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 06a9582..3f6415d 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -188,19 +188,24 @@ static int vdpau_h264_decode_slice(AVCodecContext *avctx, static int vdpau_h264_end_frame(AVCodecContext *avctx) { + int res = 0; AVVDPAUContext *hwctx = avctx->hwaccel_context; H264Context *h = avctx->priv_data; Picture *pic = h->cur_pic_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); + if (!hwctx->render) { + res = hwctx->render2(avctx, &pic->f, (void *)&pic_ctx->info, + pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); + } else hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); ff_h264_draw_horiz_band(h, 0, h->avctx->height); av_freep(&pic_ctx->bitstream_buffers); - return 0; + return res; } AVHWAccel ff_h264_vdpau_hwaccel = { -- 1.8.3.2

4 6

AVFrame.opaque has multiple definitions
by Duale Y Nelson 11 Aug '13

11 Aug '13

in avformat.h, it's defined as uint64_t in avutil.h, it's defined as void* 32 bit systems break just saying

2 1

[PATCH] lavu: fix grammar in doxy for av_frame_ref.
by Thilo Borgmann 10 Aug '13

10 Aug '13

-Thilo

2 1

[PATCH] lavd: Fix make checkheaders
by James Almer 10 Aug '13

10 Aug '13

Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavdevice/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 1c6a463..424ce98 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -46,6 +46,8 @@ OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow_capture.h +SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h +SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h -- 1.8.1.5

2 1

[PATCH] bprint: Include va_copy compat
by Derek Buitenhuis 10 Aug '13

10 Aug '13

Fixes build with MSVC and ICL. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> --- libavutil/bprint.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/bprint.c b/libavutil/bprint.c index e779956..cd91bc4 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -26,6 +26,7 @@ #include "avstring.h" #include "bprint.h" #include "common.h" +#include "compat/va_copy.h" #include "error.h" #include "mem.h" -- 1.8.4.rc1

2 1

[PATCH 1/2] avutil/bprint: add av_vbprintf()
by Michael Niedermayer 10 Aug '13

10 Aug '13

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavutil/bprint.c | 23 +++++++++++++++++++++++ libavutil/bprint.h | 7 +++++++ 2 files changed, 30 insertions(+) diff --git a/libavutil/bprint.c b/libavutil/bprint.c index fd7611a..e779956 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -113,6 +113,29 @@ void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_bprint_grow(buf, extra_len); } +void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg) +{ + unsigned room; + char *dst; + int extra_len; + va_list vl; + + while (1) { + room = av_bprint_room(buf); + dst = room ? buf->str + buf->len : NULL; + va_copy(vl, vl_arg); + extra_len = vsnprintf(dst, room, fmt, vl); + va_end(vl); + if (extra_len <= 0) + return; + if (extra_len < room) + break; + if (av_bprint_alloc(buf, extra_len)) + break; + } + av_bprint_grow(buf, extra_len); +} + void av_bprint_chars(AVBPrint *buf, char c, unsigned n) { unsigned room, real_n; diff --git a/libavutil/bprint.h b/libavutil/bprint.h index dc86f12..bb1de25 100644 --- a/libavutil/bprint.h +++ b/libavutil/bprint.h @@ -21,6 +21,8 @@ #ifndef AVUTIL_BPRINT_H #define AVUTIL_BPRINT_H +#include <stdarg.h> + #include "attributes.h" #include "avstring.h" @@ -122,6 +124,11 @@ void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size); void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3); /** + * Append a formatted string to a print buffer. + */ +void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg); + +/** * Append char c n times to a print buffer. */ void av_bprint_chars(AVBPrint *buf, char c, unsigned n); -- 1.7.9.5

2 7

[PATCH] lavc: make invalid UTF-8 in subtitle output a non-fatal error
by wm4 10 Aug '13

10 Aug '13

The intention of this error was preventing the generation of broken files. But in practice, dropping the output is not very helpful. Consider a subtitle file that contains mostly ASCII, but has some lines that use special characters (like umlauts or accents) encoded in a legacy codepage. Then most lines will be intact in the output file, but lines with broken encoding will be missing. The user might not even see the error, and it will appear as if the subtitle line was missing in the original subtitle file. Surely it's better to keep these broken lines, and most of the subtitle text will probably still be readable. Keeping the broken output will also make it easier for the user to locate the error, such as by knowing the subtitle event time. --- libavcodec/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 97d066f..14a3b5f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2288,8 +2288,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, av_log(avctx, AV_LOG_ERROR, "Invalid UTF-8 in decoded subtitles text; " "maybe missing -sub_charenc option\n"); - avsubtitle_free(sub); - return AVERROR_INVALIDDATA; } } -- 1.8.3.1

6 48

[PATCH 1/5] lavc: move UTF-8 validation to lavu.
by Nicolas George 10 Aug '13

10 Aug '13

Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavcodec/utils.c | 22 ++-------------------- libavutil/avstring.c | 20 ++++++++++++++++++++ libavutil/internal.h | 5 +++++ 3 files changed, 27 insertions(+), 20 deletions(-) I believe this version is ready for review. There are still parts that will need to be added later, they concern mostly how users are supposed to control the encoding conversion, but they are a matter of deciding what is most convenient and can be just added on top of what is already there. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fd08bec..c13b4b1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2271,25 +2271,6 @@ end: #endif } -static int utf8_check(const uint8_t *str) -{ - const uint8_t *byte; - uint32_t codepoint, min; - - while (*str) { - byte = str; - GET_UTF8(codepoint, *(byte++), return 0;); - min = byte - str == 1 ? 0 : byte - str == 2 ? 0x80 : - 1 << (5 * (byte - str) - 4); - if (codepoint < min || codepoint >= 0x110000 || - codepoint == 0xFFFE /* BOM */ || - codepoint >= 0xD800 && codepoint <= 0xDFFF /* surrogates */) - return 0; - str = byte; - } - return 1; -} - int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, AVPacket *avpkt) @@ -2332,7 +2313,8 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, } for (i = 0; i < sub->num_rects; i++) { - if (sub->rects[i]->ass && !utf8_check(sub->rects[i]->ass)) { + if (sub->rects[i]->ass && + !avpriv_utf8_check(sub->rects[i]->ass, strlen(sub->rects[i]->ass))) { av_log(avctx, AV_LOG_ERROR, "Invalid UTF-8 in decoded subtitles text; " "maybe missing -sub_charenc option\n"); diff --git a/libavutil/avstring.c b/libavutil/avstring.c index cf9be2a..16d85d8 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -29,6 +29,7 @@ #include "mem.h" #include "avstring.h" #include "bprint.h" +#include "internal.h" int av_strstart(const char *str, const char *pfx, const char **ptr) { @@ -307,6 +308,25 @@ int av_isxdigit(int c) return av_isdigit(c) || (c >= 'a' && c <= 'f'); } +int avpriv_utf8_check(const uint8_t *str, size_t len) +{ + const uint8_t *byte, *end = str + len; + uint32_t codepoint, min; + + while (str < end) { + byte = str; + GET_UTF8(codepoint, *(byte++), return 0;); + min = byte - str == 1 ? 0 : byte - str == 2 ? 0x80 : + 1 << (5 * (byte - str) - 4); + if (codepoint < min || codepoint >= 0x110000 || + codepoint == 0xFFFE /* BOM */ || + codepoint >= 0xD800 && codepoint <= 0xDFFF /* surrogates */) + return 0; + str = byte; + } + return 1; +} + #ifdef TEST int main(void) diff --git a/libavutil/internal.h b/libavutil/internal.h index 680d600..aebff6b 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -203,4 +203,9 @@ void avpriv_request_sample(void *avc, */ int avpriv_open(const char *filename, int flags, ...); +/** + * Check if a strings looks like valid UTF-8 + */ +int avpriv_utf8_check(const uint8_t *str, size_t len); + #endif /* AVUTIL_INTERNAL_H */ -- 1.7.10.4

3 9

[PATCH] lavc/ac3: set channel_layout when downmixing.
by Nicolas George 10 Aug '13

10 Aug '13

Fix a "Guessed Channel Layout" warning. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavcodec/aac_ac3_parser.c | 1 + libavcodec/ac3dec.c | 1 + 2 files changed, 2 insertions(+) FATE passes. Note that this instance of av_get_default_channel_layout is only called with channels = 1 or 2. diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 6f1e188..ec52fb7 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -90,6 +90,7 @@ get_next: (avctx->codec_id == AV_CODEC_ID_AC3 || avctx->codec_id == AV_CODEC_ID_EAC3)))) { avctx->channels = avctx->request_channels; + avctx->channel_layout = av_get_default_channel_layout(avctx->channels); } else { avctx->channels = s->channels; avctx->channel_layout = s->channel_layout; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index fc15a41..da7a273 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -182,6 +182,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) avctx->request_channels < avctx->channels && avctx->request_channels <= 2) { avctx->channels = avctx->request_channels; + avctx->channel_layout = av_get_default_channel_layout(avctx->channels); } s->downmixed = 1; -- 1.7.10.4

2 3

[PATCH] doc/filters: fix sine sample_rate abbreviation
by Mark Harris 10 Aug '13

10 Aug '13

--- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 0adec4b..aba67c7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1958,7 +1958,7 @@ Set the carrier frequency. Default is 440 Hz. Enable a periodic beep every second with frequency @var{beep_factor} times the carrier frequency. Default is 0, meaning the beep is disabled. -@item sample_rate, s +@item sample_rate, r Specify the sample rate, default is 44100. @item duration, d -- 1.8.3.4

2 1

[PATCH] Try to make new VDPAU usable by adding context to callback.
by Reimar Döffinger 09 Aug '13

09 Aug '13

Using VDPAU correctly means checking for preemption and possibly regenerating the context all the time. With the current API there is no context or other user-defined pointer and thus this in not possible unless using some hack like global variables. This introduces a new decode function that gets both the AVCodecContext and AVFrame in addition, in both the user can store additional opaque data. Unfortunately the HWAccel API has no way of providing API/ABI compatibility, so a currently disallowed state (render pointer being NULL) is used to extend it. An alternative would be to add the new function pointer to the AVCodecContext. Strictly speaking this probably doesn't have to be under !INCOMPATIBLE condition. --- libavcodec/vdpau.c | 6 ++++++ libavcodec/vdpau.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index cf564a5..218d218 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -61,6 +61,12 @@ int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx) struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); +#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI + if (!hwctx->render) { + hwctx->render2(avctx, &pic->f, surf, (void *)&pic_ctx->info, + pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); + } else +#endif hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 08116bf..b77d988 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -128,6 +128,12 @@ typedef struct AVVDPAUContext { attribute_deprecated VdpBitstreamBuffer *bitstream_buffers; #endif +#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI + int (*render2)(struct AVCodecContext *, struct AVFrame *, VdpVideoSurface, + const VdpPictureInfo *, + uint32_t, + const VdpBitstreamBuffer *); +#endif } AVVDPAUContext; #if FF_API_CAP_VDPAU -- 1.8.3.2

4 15

[PATCH] Integrate accessors.h header into internal.h
by Reimar Döffinger 09 Aug '13

09 Aug '13

I have no idea what I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> --- libavcodec/utils.c | 1 - libavformat/utils.c | 1 - libavutil/accessors.h | 3 --- libavutil/frame.c | 2 -- libavutil/internal.h | 4 ++++ 5 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 libavutil/accessors.h diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 063105a..c23805a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -26,7 +26,6 @@ */ #include "config.h" -#include "libavutil/accessors.h" #include "libavutil/atomic.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index e44f716..8133019 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -25,7 +25,6 @@ #include "libavcodec/internal.h" #include "libavcodec/raw.h" #include "libavcodec/bytestream.h" -#include "libavutil/accessors.h" #include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/dict.h" diff --git a/libavutil/accessors.h b/libavutil/accessors.h deleted file mode 100644 index 471cdff..0000000 --- a/libavutil/accessors.h +++ /dev/null @@ -1,3 +0,0 @@ -#define MAKE_ACCESSORS(str, name, type, field) \ - type av_##name##_get_##field(const str *s) { return s->field; } \ - void av_##name##_set_##field(str *s, type v) { s->field = v; } diff --git a/libavutil/frame.c b/libavutil/frame.c index df03e25..b0fdd49 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -27,8 +27,6 @@ #include "mem.h" #include "samplefmt.h" -#include "accessors.h" - MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) diff --git a/libavutil/internal.h b/libavutil/internal.h index 680d600..786bd86 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -76,6 +76,10 @@ #define FF_MEMORY_POISON 0x2a +#define MAKE_ACCESSORS(str, name, type, field) \ + type av_##name##_get_##field(const str *s) { return s->field; } \ + void av_##name##_set_##field(str *s, type v) { s->field = v; } + // Some broken preprocessors need a second expansion // to be forced to tokenize __VA_ARGS__ #define E1(x) x -- 1.8.4.rc1

2 1

[PATCH 2/4] tty: disable extension matching
by wm4 09 Aug '13

09 Aug '13

This demuxer isn't very useful and causes more trouble than it solves. In psrticular, it matches .txt files too eagerly. It should be left to the application what to do with text files, and ana pplication shouldn't be forced to blacklist libavformat fringe demuxers. --- libavformat/tty.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/tty.c b/libavformat/tty.c index 3afb9b2..ec39687 100644 --- a/libavformat/tty.c +++ b/libavformat/tty.c @@ -155,6 +155,5 @@ AVInputFormat ff_tty_demuxer = { .priv_data_size = sizeof(TtyDemuxContext), .read_header = read_header, .read_packet = read_packet, - .extensions = "ans,art,asc,diz,ice,nfo,txt,vt", .priv_class = &tty_demuxer_class, }; -- 1.8.4.rc1

6 10

[PATCH 1/4] ffplay: free subtitle pictures on exit
by Marton Balint 09 Aug '13

09 Aug '13

Signed-off-by: Marton Balint <cus(a)passwd.hu> --- ffplay.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffplay.c b/ffplay.c index d462eee..cfb927e 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1018,6 +1018,8 @@ static void stream_close(VideoState *is) vp->bmp = NULL; } } + for (i = 0; i < SUBPICTURE_QUEUE_SIZE; i++) + free_subpicture(&is->subpq[i]); SDL_DestroyMutex(is->pictq_mutex); SDL_DestroyCond(is->pictq_cond); SDL_DestroyMutex(is->subpq_mutex); -- 1.8.1.4

2 5

[PATCH] Reduce MAKE_ACCESSORS code duplication via a new header.
by Reimar Döffinger 09 Aug '13

09 Aug '13

--- libavcodec/utils.c | 5 +---- libavformat/utils.c | 5 +---- libavutil/accessors.h | 3 +++ libavutil/frame.c | 4 +--- 4 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 libavutil/accessors.h diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fd08bec..063105a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -26,6 +26,7 @@ */ #include "config.h" +#include "libavutil/accessors.h" #include "libavutil/atomic.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" @@ -1029,10 +1030,6 @@ void avcodec_free_frame(AVFrame **frame) av_freep(frame); } -#define MAKE_ACCESSORS(str, name, type, field) \ - type av_##name##_get_##field(const str *s) { return s->field; } \ - void av_##name##_set_##field(str *s, type v) { s->field = v; } - MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) diff --git a/libavformat/utils.c b/libavformat/utils.c index 727711b..e44f716 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -25,6 +25,7 @@ #include "libavcodec/internal.h" #include "libavcodec/raw.h" #include "libavcodec/bytestream.h" +#include "libavutil/accessors.h" #include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/dict.h" @@ -98,10 +99,6 @@ static int64_t wrap_timestamp(AVStream *st, int64_t timestamp) return timestamp; } -#define MAKE_ACCESSORS(str, name, type, field) \ - type av_##name##_get_##field(const str *s) { return s->field; } \ - void av_##name##_set_##field(str *s, type v) { s->field = v; } - MAKE_ACCESSORS(AVStream, stream, AVRational, r_frame_rate) /* an arbitrarily chosen "sane" max packet size -- 50M */ diff --git a/libavutil/accessors.h b/libavutil/accessors.h new file mode 100644 index 0000000..471cdff --- /dev/null +++ b/libavutil/accessors.h @@ -0,0 +1,3 @@ +#define MAKE_ACCESSORS(str, name, type, field) \ + type av_##name##_get_##field(const str *s) { return s->field; } \ + void av_##name##_set_##field(str *s, type v) { s->field = v; } diff --git a/libavutil/frame.c b/libavutil/frame.c index 5021d07..df03e25 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -27,9 +27,7 @@ #include "mem.h" #include "samplefmt.h" -#define MAKE_ACCESSORS(str, name, type, field) \ - type av_##name##_get_##field(const str *s) { return s->field; } \ - void av_##name##_set_##field(str *s, type v) { s->field = v; } +#include "accessors.h" MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) -- 1.8.3.2

5 6

[PATCH] av_tempfile: use avpriv_open()
by Michael Niedermayer 08 Aug '13

08 Aug '13

Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavutil/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/file.c b/libavutil/file.c index 8d03534..7e762dc 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -188,7 +188,7 @@ int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_c # ifndef O_EXCL # define O_EXCL 0 # endif - fd = open(*filename, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0600); + fd = avpriv_open(*filename, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0600); #else snprintf(*filename, len, "/tmp/%sXXXXXX", prefix); fd = mkstemp(*filename); -- 1.7.9.5

3 2

[PATCH] lswr/rematrix: avoid clipping for floats too.
by Nicolas George 08 Aug '13

08 Aug '13

A later conversion to a limited range is rather likely, either inside ffmpeg or at a later step of the processing, and having the rematrix coefficients depend on the format is fragile. The old behaviour can be emulated by setting the rematrix_maxval option to a large value. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libswresample/rematrix.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) Whether this is a good or a bad thing is open to discussion. No FATE test needed updating, which does not bode well for lswr coverage ;-( diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index f13c240..af4c655 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -307,11 +307,8 @@ av_cold static int auto_matrix(SwrContext *s) if (s->rematrix_maxval > 0) { maxval = s->rematrix_maxval; - } else if ( av_get_packed_sample_fmt(s->out_sample_fmt) < AV_SAMPLE_FMT_FLT - || av_get_packed_sample_fmt(s->int_sample_fmt) < AV_SAMPLE_FMT_FLT) { - maxval = 1.0; } else - maxval = INT_MAX; + maxval = 1.0; if(maxcoef > maxval || s->rematrix_volume < 0){ maxcoef /= maxval; -- 1.7.10.4

2 1

[PATCH] MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c
by Matthieu Bouron 08 Aug '13

08 Aug '13

--- Hi, If you agree, I would like to take co-maintenance over aiffdec, aiffenc and movenc. Regards, Matthieu --- MAINTAINERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6f40fea..b07ea9d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -318,7 +318,8 @@ Muxers/Demuxers: 4xm.c Mike Melanson adtsenc.c Robert Swain afc.c Paul B Mahol - aiff.c Baptiste Coudurier + aiffdec.c Baptiste Coudurier, Matthieu Bouron + aiffenc.c Baptiste Coudurier, Matthieu Bouron ape.c Kostya Shishkov ass* Aurelien Jacobs astdec.c Paul B Mahol @@ -365,7 +366,7 @@ Muxers/Demuxers: mgsts.c Paul B Mahol mm.c Peter Ross mov.c Michael Niedermayer, Baptiste Coudurier - movenc.c Michael Niedermayer, Baptiste Coudurier + movenc.c Michael Niedermayer, Baptiste Coudurier, Matthieu Bouron mpc.c Kostya Shishkov mpeg.c Michael Niedermayer mpegenc.c Michael Niedermayer -- 1.7.12.4 (Apple Git-37)

2 2

[PATCH 1/2] lavu: add text_file API.
by Nicolas George 08 Aug '13

08 Aug '13

TODO: version bump, APIChanges entry, !HAVE_ICONV path. Signed-off-by: Nicolas George <nicolas.george(a)normalesup.org> --- libavutil/Makefile | 1 + libavutil/text_file.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++ libavutil/text_file.h | 181 ++++++++++++++++++++++++++++++++++ 3 files changed, 444 insertions(+) create mode 100644 libavutil/text_file.c create mode 100644 libavutil/text_file.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 21746f0..7d59a73 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -107,6 +107,7 @@ OBJS = adler32.o \ samplefmt.o \ sha.o \ sha512.o \ + text_file.o \ time.o \ timecode.o \ tree.o \ diff --git a/libavutil/text_file.c b/libavutil/text_file.c new file mode 100644 index 0000000..e5f8b78 --- /dev/null +++ b/libavutil/text_file.c @@ -0,0 +1,262 @@ +/* + * Copyright (c) 2013 Nicolas George + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avassert.h" +#include "avstring.h" +#include "bprint.h" +#include "text_file.h" + +#include <iconv.h> + +#define COPY_FROM_USER(var) \ + av_assert0(var ## _user->struct_size <= sizeof(var)); \ + memcpy(&var, var ## _user, var ## _user->struct_size); +#define COPY_TO_USER(var) \ + memcpy(var ## _user, &var, var ## _user->struct_size); + +static const struct { + unsigned char encoding[9], bom[4], len; +} byte_order_marks[] = { + { "UTF-8", "\xef\xbb\xbf", 3 }, + { "UCS-4BE", "\x00\x00\xfe\xff", 4 }, + { "UCS-4LE", "\xff\xfe\x00\x00", 4 }, + { "UTF-16BE", "\xfe\xff", 2 }, + { "UTF-16LE", "\xff\xfe", 2 }, +}; + +static const char *const default_encodings[] = { + "UTF-8", + "US-ASCII", + "WINDOWS-1252", + "ISO-8859-1", + NULL +}; + +static int try_encoding(AVTextFile *tf, const char *encoding) +{ + iconv_t cd; + AVBPrint bp; + char *inbuf, *outbuf, *recoded; + size_t insize, outsize, insize_orig; + unsigned outsize_int; + int ret = 0; + + if ((cd = iconv_open("UTF-8", encoding)) == (iconv_t)-1) + return AVERROR(errno); + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); + inbuf = tf->full_data; + insize = tf->full_data_size; + while (insize) { + av_bprint_get_buffer(&bp, 512, (unsigned char **)&outbuf, &outsize_int); + if (outsize_int <= 1) { + ret = AVERROR(ENOMEM); + break; + } + outsize_int--; + outsize = outsize_int; + insize_orig = insize; + iconv(cd, &inbuf, &insize, &outbuf, &outsize); + if (insize == insize_orig) { + ret = AVERROR_INVALIDDATA; + break; + } + bp.len += outsize_int - outsize; + } + iconv_close(cd); + if (ret < 0) { + av_bprint_finalize(&bp, NULL); + return ret; + } + av_assert1(!insize); + bp.str[bp.len] = 0; + if ((ret = av_bprint_finalize(&bp, &recoded)) < 0) + return ret; + av_free(tf->full_data); + tf->full_data = recoded; + tf->full_data_size = bp.len; + tf->encoding = encoding; + return 0; +} + +static int guess_encoding(AVTextFile *tf) +{ + const char *bom_encoding[2] = { NULL, NULL }; + const char *const *encodings; + int ret, i; + + encodings = tf->encodings; + if (!encodings) { + for (i = 0; i < FF_ARRAY_ELEMS(byte_order_marks); i++) { + if (!memcmp(tf->full_data, byte_order_marks[i].bom, + byte_order_marks[i].len)) { + encodings = bom_encoding; + bom_encoding[0] = byte_order_marks[i].encoding; + break; + } + } + if (!encodings) + encodings = default_encodings; + } + + for (i = 0; encodings[i]; i++) + if ((ret = try_encoding(tf, encodings[i])) >= 0) + return ret; + + av_strlcpy(tf->error, "Unable to guess character encoding", + sizeof(tf->error)); + return AVERROR_INVALIDDATA; +} + +static void remove_cr(AVTextFile *tf) +{ + uint8_t *p, *q, *end; + + p = q = tf->text; + end = p + tf->text_size; + for (; p < end; p++) + if (*p != '\r' || p[1] != '\n') + *(q++) = *p; + tf->text_size = q - tf->text; + *(q++) = 0; +} + +static int split_lines(AVTextFile *tf) +{ + size_t i, nb_lines = 0; + uint8_t *p, *end = tf->text + tf->text_size; + + if (tf->text_size) { + nb_lines++; + for (p = tf->text; p < end - 1; p++) + if (*p == '\n') + nb_lines++; + } + tf->lines = av_calloc(nb_lines + 1, sizeof(*tf->lines)); + tf->lines[0] = p = tf->text; + for (i = 1; i < nb_lines; i++) { + p = memchr(p, '\n', end - p); + av_assert1(p); + *p = 0; + tf->lines[i] = ++p; + } + if (tf->text_size) { + if ((p = memchr(p, '\n', end - p))) { + av_assert1(p == end - 1); + *p = 0; + } else { + tf->text_flags |= AV_TEXT_FLAG_NO_EOL; + } + } + tf->nb_lines = nb_lines; + return 0; +} + +static int text_file_process(AVTextFile *tf) +{ + int ret; + + tf->text_flags = 0; + if ((ret = guess_encoding(tf)) < 0) + return ret; + tf->text = tf->full_data; + tf->text_size = tf->full_data_size; + + if (!memcmp(tf->text, byte_order_marks[0].bom, 3)) { + tf->text_size -= 3; + tf->text += 3; + tf->text_flags |= AV_TEXT_FLAG_HAS_BOM; + } + + if ((tf->flags & AV_TEXT_FLAG_REMOVE_CR)) + remove_cr(tf); + if ((tf->flags & AV_TEXT_FLAG_SPLIT_LINES)) + if ((ret = split_lines(tf)) < 0) + return ret; + + return 0; +} + +static int text_file_try_read(AVTextFile *tf, + AVTextFileRead callback, void *opaque) +{ + AVBPrint bp; + unsigned buf_size; + uint8_t *buf; + int ret; + + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); + while (1) { + av_bprint_get_buffer(&bp, 512, &buf, &buf_size); + if (buf_size <= 1) { + ret = AVERROR(ENOMEM); + break; + } + ret = callback(opaque, buf, FFMIN(buf_size - 1, INT_MAX)); + if (ret < 0) { + if (ret == AVERROR_EOF) + ret = 0; + break; + } + bp.len += ret; + } + + if (ret < 0) { + av_bprint_finalize(&bp, NULL); + return ret; + } + if ((ret = av_bprint_finalize(&bp, (char **)&tf->full_data)) < 0) + return ret; + tf->full_data_size = bp.len; + return text_file_process(tf); +} + +static int text_file_read(AVTextFile *tf, + AVTextFileRead callback, void *opaque) +{ + int ret; + + *tf->error = 0; + if ((ret = text_file_try_read(tf, callback, opaque)) < 0) { + if (!*tf->error) + av_strerror(ret, tf->error, sizeof(tf->error)); + av_text_file_free(tf); + } + return ret; +} + +void av_text_file_free(AVTextFile *tf) +{ + tf->text = NULL; + av_freep(&tf->lines); + av_freep(&tf->full_data); + tf->text_size = tf->full_data_size = 0; +} + +int av_text_file_read_callback(AVTextFile *tf_user, + AVTextFileRead callback, void *opaque) +{ + AVTextFile tf = { 0 }; + int ret; + + COPY_FROM_USER(tf); + ret = text_file_read(&tf, callback, opaque); + COPY_TO_USER(tf); + return ret; +} diff --git a/libavutil/text_file.h b/libavutil/text_file.h new file mode 100644 index 0000000..d1bfbd3 --- /dev/null +++ b/libavutil/text_file.h @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2013 Nicolas George + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_TEXT_FILE_H +#define AVUTIL_TEXT_FILE_H + +#include "common.h" + +/** + * Structure to help read text files. + * This API allows to read text files (or other ways of storing text) while + * handling the subtleties of character encodings, end-of-line separators, + * etc. + * + * The text returned by this function is always recoded to UTF-8. + * + * The typical way of using this API is to declare a AVTextFile variable + * with the default initialization macro: + * AVTextFile tf = { AV_TEXT_FILE_DEFAULT }; + * Then set fields to control various parts of the process and use it with + * the API functions. + */ +typedef struct AVTextFile { + + /** + * Size of the structure; must be set to sizeof(AVTextFile) to ensure + * compatibility with later versions of the library. + */ + + size_t struct_size; + + /** + * Text read from the file. Always terminated by an additional 0. + */ + uint8_t *text; + + /** + * Size of text, in bytes, not counting the additional terminating 0. + */ + size_t text_size; + + /** + * Full data buffer containing the text; must be freed with av_free() + * when no longer needed. Can be different from text due to details such + * as byte-order-marks. + */ + uint8_t *full_data; + + /** + * Size of full_data, in bytes, not counting the additional 0. + */ + size_t full_data_size; + + /** + * Detected encoding; will point to either a static string or an element + * of the encodings field. + */ + const char *encoding; + + /** + * List of encodings for audodetection, terminated by NULL. + * The first encoding in this list that can apply to the file is used. + */ + const char *const *encodings; + + /** + * Lines of the file; only relevant if AV_TEXT_FLAG_SPLIT_LINES is set. + * Terminated by an additional NULL pointer. + */ + char **lines; + + /** + * Number of elements in the lines array, not counting the additional + * NULL. + */ + size_t nb_lines; + + /** + * Flags to control the processing of the file. See the AV_TEXT_FLAG_* + * constants below. + */ + unsigned flags; + + /** + * Flags describing features of the file hidden by the conversion. See + * the AV_TEXT_FLAG_* constants below. + */ + unsigned text_flags; + + /** + * Error message. If something fails, this field will contain a + * human-readable error message. + */ + char error[128]; + +} AVTextFile; + +/** + * Processing flags. + * The following constants apply to the AVTextFile.flags field. + */ +enum { + + /** + * Split the file into individual lines. + * The newline characters are replaced by 0. + */ + AV_TEXT_FLAG_SPLIT_LINES = 0x1, + + /** + * Remove CR (\r) before LF (\n). + * In other words, convert DOS-style line breaks to Unix-style. + */ + AV_TEXT_FLAG_REMOVE_CR = 0x2, +}; + +/** + * Result flags. + * The following constants apply to the AVTextFile.text_flags field. + */ +enum { + + /** + * The file had a byte order mark. + * The first character of the file was U+FEFF ZERO WIDTH NO-BREAK SPACE. + */ + AV_TEXT_FLAG_HAS_BOM = 0x1, + + /** + * The final line of the file was not terminated by a final LF (\n). + * Only relevant if lines were split. + */ + AV_TEXT_FLAG_NO_EOL = 0x2, +}; + +/** + * Callback to read from a file. + * @param opaque opaque value passed from the caller + * @param buf buffer to fill with the file data + * @param buf_size size of the buffer + * @return the number of bytes read or a negative error code + */ +typedef int (*AVTextFileRead)(void *opaque, unsigned char *buf, int buf_size); + +/** + * Read a text file from a callback. + */ +int av_text_file_read_callback(AVTextFile *tf, + AVTextFileRead callback, void *opaque); + +/** + * Read a text file from the local file system (using stdio). + */ +int av_text_file_read_file(AVTextFile *tf, const char *filename); + +/** + * Free all memory allocated while reading the file. + * The corresponding fields are set to NULL. + */ +void av_text_file_free(AVTextFile *tf); + +#define AV_TEXT_FILE_DEFAULT sizeof(AVTextFile) + +#endif /* AVUTIL_TEXT_FILE_H */ -- 1.7.10.4

2 2