From bc61920d89dde3e35762ace10bb6830a091a15b9 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sat, 26 Mar 2011 17:59:09 -0700 Subject: [PATCH 1/5] http: header field names are case insensitive Amazon S3 sends header field names all lowercase. This is actually acceptable according to the HTTP standard. http://tools.ietf.org/html/rfc2616#section-4.2 Signed-off-by: Luca Barbato --- libavformat/http.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 2b034a13f4..9b3d606d72 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -246,12 +246,12 @@ static int process_line(URLContext *h, char *line, int line_count, p++; while (isspace(*p)) p++; - if (!strcmp(tag, "Location")) { + if (!strcasecmp(tag, "Location")) { strcpy(s->location, p); *new_location = 1; - } else if (!strcmp (tag, "Content-Length") && s->filesize == -1) { + } else if (!strcasecmp (tag, "Content-Length") && s->filesize == -1) { s->filesize = atoll(p); - } else if (!strcmp (tag, "Content-Range")) { + } else if (!strcasecmp (tag, "Content-Range")) { /* "bytes $from-$to/$document_size" */ const char *slash; if (!strncmp (p, "bytes ", 6)) { @@ -261,14 +261,14 @@ static int process_line(URLContext *h, char *line, int line_count, s->filesize = atoll(slash+1); } h->is_streamed = 0; /* we _can_ in fact seek */ - } else if (!strcmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) { + } else if (!strcasecmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) { s->filesize = -1; s->chunksize = 0; - } else if (!strcmp (tag, "WWW-Authenticate")) { + } else if (!strcasecmp (tag, "WWW-Authenticate")) { ff_http_auth_handle_header(&s->auth_state, tag, p); - } else if (!strcmp (tag, "Authentication-Info")) { + } else if (!strcasecmp (tag, "Authentication-Info")) { ff_http_auth_handle_header(&s->auth_state, tag, p); - } else if (!strcmp (tag, "Connection")) { + } else if (!strcasecmp (tag, "Connection")) { if (!strcmp(p, "close")) s->willclose = 1; } From 364cbc346b336e5d09b371ce05650f30be813276 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 28 Mar 2011 09:53:40 +0200 Subject: [PATCH 2/5] cosmetics: fix dashed line length after 070c5d0 --- LICENSE | 2 +- README | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 3b233c67c1..725995da56 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Libav: -------- +------ Most files in Libav are under the GNU Lesser General Public License version 2.1 or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other diff --git a/README b/README index 6346cff926..afef671611 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Libav README -------------- +------------ 1) Documentation ---------------- From c6f951442efb34dd63e1e00b19bc30447075d5a3 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Mon, 7 Mar 2011 18:54:52 +0100 Subject: [PATCH 3/5] framebuffer device demuxer Signed-off-by: Anton Khirnov --- Changelog | 1 + configure | 2 + doc/indevs.texi | 25 ++++ libavdevice/Makefile | 1 + libavdevice/alldevices.c | 1 + libavdevice/avdevice.h | 2 +- libavdevice/fbdev.c | 250 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 281 insertions(+), 1 deletion(-) create mode 100644 libavdevice/fbdev.c diff --git a/Changelog b/Changelog index f417d7c274..86db2aef0e 100644 --- a/Changelog +++ b/Changelog @@ -80,6 +80,7 @@ version : - Bitmap Brothers JV playback system - Apple HTTP Live Streaming protocol handler - sndio support for playback and record +- Linux framebuffer input device added version 0.6: diff --git a/configure b/configure index f8adf48b1a..0f8b8491e5 100755 --- a/configure +++ b/configure @@ -1430,6 +1430,7 @@ alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_outdev_deps="alsa_asoundlib_h" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" dv1394_indev_deps="dv1394 dv_demuxer" +fbdev_indev_deps="linux_fb_h" jack_indev_deps="jack_jack_h" libdc1394_indev_deps="libdc1394" oss_indev_deps_any="soundcard_h sys_soundcard_h" @@ -2897,6 +2898,7 @@ fi texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html +check_header linux/fb.h check_header linux/videodev.h check_header linux/videodev2.h check_header sys/videoio.h diff --git a/doc/indevs.texi b/doc/indevs.texi index 2d66033ca1..c5e04b029e 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -59,6 +59,31 @@ BSD video input device. Linux DV 1394 input device. +@section fbdev + +Linux framebuffer input device. + +The Linux framebuffer is a graphic hardware-independent abstraction +layer to show graphics on a computer monitor, typically on the +console. It is accessed through a file device node, usually +@file{/dev/fb0}. + +For more detailed information read the file +Documentation/fb/framebuffer.txt included in the Linux source tree. + +To record from the framebuffer device @file{/dev/fb0} with +@file{ffmpeg}: +@example +ffmpeg -f fbdev -r 10 -i /dev/fb0 out.avi +@end example + +You can take a single screenshot image with the command: +@example +ffmpeg -f fbdev -vframes 1 -r 1 -i /dev/fb0 screenshot.jpeg +@end example + +See also @url{http://linux-fbdev.sourceforge.net/}, and fbset(1). + @section jack JACK input device. diff --git a/libavdevice/Makefile b/libavdevice/Makefile index efc18cbcbd..5cfc5e8ecc 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -14,6 +14,7 @@ OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \ alsa-audio-enc.o OBJS-$(CONFIG_BKTR_INDEV) += bktr.o OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o +OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 9cbb977813..0e2cf6d12e 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -42,6 +42,7 @@ void avdevice_register_all(void) REGISTER_INOUTDEV (ALSA, alsa); REGISTER_INDEV (BKTR, bktr); REGISTER_INDEV (DV1394, dv1394); + REGISTER_INDEV (FBDEV, fbdev); REGISTER_INDEV (JACK, jack); REGISTER_INOUTDEV (OSS, oss); REGISTER_INOUTDEV (SNDIO, sndio); diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 28c12f2ecd..497683a11b 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -22,7 +22,7 @@ #include "libavutil/avutil.h" #define LIBAVDEVICE_VERSION_MAJOR 52 -#define LIBAVDEVICE_VERSION_MINOR 3 +#define LIBAVDEVICE_VERSION_MINOR 4 #define LIBAVDEVICE_VERSION_MICRO 0 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c new file mode 100644 index 0000000000..6b03be4751 --- /dev/null +++ b/libavdevice/fbdev.c @@ -0,0 +1,250 @@ +/* + * Copyright (c) 2011 Stefano Sabatini + * Copyright (c) 2009 Giliard B. de Freitas + * Copyright (C) 2002 Gunnar Monell + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Linux framebuffer input device, + * inspired by code from fbgrab.c by Gunnar Monell. + * See also http://linux-fbdev.sourceforge.net/. + */ + +/* #define DEBUG */ + +#include +#include +#include +#include +#include +#include +#include + +#include "libavutil/mem.h" +#include "libavutil/pixdesc.h" +#include "libavformat/avformat.h" + +struct rgb_pixfmt_map_entry { + int bits_per_pixel; + int red_offset, green_offset, blue_offset, alpha_offset; + enum PixelFormat pixfmt; +}; + +static struct rgb_pixfmt_map_entry rgb_pixfmt_map[] = { + // bpp, red_offset, green_offset, blue_offset, alpha_offset, pixfmt + { 32, 0, 8, 16, 24, PIX_FMT_RGBA }, + { 32, 16, 8, 0, 24, PIX_FMT_BGRA }, + { 32, 8, 16, 24, 0, PIX_FMT_ARGB }, + { 32, 3, 2, 8, 0, PIX_FMT_ABGR }, + { 24, 0, 8, 16, 0, PIX_FMT_RGB24 }, + { 24, 16, 8, 0, 0, PIX_FMT_BGR24 }, +}; + +static enum PixelFormat get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo) +{ + int i; + + for (i = 0; i < FF_ARRAY_ELEMS(rgb_pixfmt_map); i++) { + struct rgb_pixfmt_map_entry *entry = &rgb_pixfmt_map[i]; + if (entry->bits_per_pixel == varinfo->bits_per_pixel && + entry->red_offset == varinfo->red.offset && + entry->green_offset == varinfo->green.offset && + entry->blue_offset == varinfo->blue.offset) + return entry->pixfmt; + } + + return PIX_FMT_NONE; +} + +typedef struct { + int frame_size; ///< size in bytes of a grabbed frame + AVRational time_base; ///< time base + int64_t time_frame; ///< time for the next frame to output (in 1/1000000 units) + + int fd; ///< framebuffer device file descriptor + int width, heigth; ///< assumed frame resolution + int frame_linesize; ///< linesize of the output frame, it is assumed to be constant + int bytes_per_pixel; + + struct fb_var_screeninfo varinfo; ///< variable info; + struct fb_fix_screeninfo fixinfo; ///< fixed info; + + uint8_t *data; ///< framebuffer data +} FBDevContext; + +av_cold static int fbdev_read_header(AVFormatContext *avctx, + AVFormatParameters *ap) +{ + FBDevContext *fbdev = avctx->priv_data; + AVStream *st = NULL; + enum PixelFormat pix_fmt; + int ret, flags = O_RDONLY; + + if (!(st = av_new_stream(avctx, 0))) + return AVERROR(ENOMEM); + av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in microseconds */ + + if (ap->time_base.den <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid time base %d/%d\n", + ap->time_base.num, ap->time_base.den); + return AVERROR(EINVAL); + } + + /* NONBLOCK is ignored by the fbdev driver, only set for consistency */ + if (avctx->flags & AVFMT_FLAG_NONBLOCK) + flags |= O_NONBLOCK; + + if ((fbdev->fd = open(avctx->filename, flags)) == -1) { + ret = AVERROR(errno); + av_log(avctx, AV_LOG_ERROR, + "Could not open framebuffer device '%s': %s\n", + avctx->filename, strerror(ret)); + return ret; + } + + if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0) { + ret = AVERROR(errno); + av_log(avctx, AV_LOG_ERROR, + "FBIOGET_VSCREENINFO: %s\n", strerror(errno)); + goto fail; + } + + if (ioctl(fbdev->fd, FBIOGET_FSCREENINFO, &fbdev->fixinfo) < 0) { + ret = AVERROR(errno); + av_log(avctx, AV_LOG_ERROR, + "FBIOGET_FSCREENINFO: %s\n", strerror(errno)); + goto fail; + } + + pix_fmt = get_pixfmt_from_fb_varinfo(&fbdev->varinfo); + if (pix_fmt == PIX_FMT_NONE) { + ret = AVERROR(EINVAL); + av_log(avctx, AV_LOG_ERROR, + "Framebuffer pixel format not supported.\n"); + goto fail; + } + + fbdev->width = fbdev->varinfo.xres; + fbdev->heigth = fbdev->varinfo.yres; + fbdev->bytes_per_pixel = (fbdev->varinfo.bits_per_pixel + 7) >> 3; + fbdev->frame_linesize = fbdev->width * fbdev->bytes_per_pixel; + fbdev->frame_size = fbdev->frame_linesize * fbdev->heigth; + fbdev->time_base = ap->time_base; + fbdev->time_frame = AV_NOPTS_VALUE; + fbdev->data = mmap(NULL, fbdev->fixinfo.smem_len, PROT_READ, MAP_SHARED, fbdev->fd, 0); + if (fbdev->data == MAP_FAILED) { + ret = AVERROR(errno); + av_log(avctx, AV_LOG_ERROR, "Error in mmap(): %s\n", strerror(errno)); + goto fail; + } + + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_RAWVIDEO; + st->codec->width = fbdev->width; + st->codec->height = fbdev->heigth; + st->codec->pix_fmt = pix_fmt; + st->codec->time_base = ap->time_base; + st->codec->bit_rate = + fbdev->width * fbdev->heigth * fbdev->bytes_per_pixel / av_q2d(ap->time_base) * 8; + + av_log(avctx, AV_LOG_INFO, + "w:%d h:%d bpp:%d pixfmt:%s tb:%d/%d bit_rate:%d\n", + fbdev->width, fbdev->heigth, fbdev->varinfo.bits_per_pixel, + av_pix_fmt_descriptors[pix_fmt].name, + ap->time_base.num, ap->time_base.den, + st->codec->bit_rate); + return 0; + +fail: + close(fbdev->fd); + return ret; +} + +static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) +{ + FBDevContext *fbdev = avctx->priv_data; + int64_t curtime, delay; + struct timespec ts; + int i, ret; + uint8_t *pin, *pout; + + if (fbdev->time_frame == AV_NOPTS_VALUE) + fbdev->time_frame = av_gettime(); + + /* wait based on the frame rate */ + curtime = av_gettime(); + delay = fbdev->time_frame - curtime; + av_dlog(avctx, + "time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n", + fbdev->time_frame, curtime, delay); + if (delay > 0) { + if (avctx->flags & AVFMT_FLAG_NONBLOCK) + return AVERROR(EAGAIN); + ts.tv_sec = delay / 1000000; + ts.tv_nsec = (delay % 1000000) * 1000; + while (nanosleep(&ts, &ts) < 0 && errno == EINTR); + } + /* compute the time of the next frame */ + fbdev->time_frame += INT64_C(1000000) * av_q2d(fbdev->time_base); + + if ((ret = av_new_packet(pkt, fbdev->frame_size)) < 0) + return ret; + + /* refresh fbdev->varinfo, visible data position may change at each call */ + if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0) + av_log(avctx, AV_LOG_WARNING, + "Error refreshing variable info: %s\n", strerror(errno)); + + pkt->pts = curtime; + + /* compute visible data offset */ + pin = fbdev->data + fbdev->bytes_per_pixel * fbdev->varinfo.xoffset + + fbdev->varinfo.yoffset * fbdev->fixinfo.line_length; + pout = pkt->data; + + // TODO it'd be nice if the lines were aligned + for (i = 0; i < fbdev->heigth; i++) { + memcpy(pout, pin, fbdev->frame_linesize); + pin += fbdev->fixinfo.line_length; + pout += fbdev->frame_linesize; + } + + return fbdev->frame_size; +} + +av_cold static int fbdev_read_close(AVFormatContext *avctx) +{ + FBDevContext *fbdev = avctx->priv_data; + + munmap(fbdev->data, fbdev->frame_size); + close(fbdev->fd); + + return 0; +} + +AVInputFormat ff_fbdev_demuxer = { + .name = "fbdev", + .long_name = NULL_IF_CONFIG_SMALL("Linux framebuffer"), + .priv_data_size = sizeof(FBDevContext), + .read_header = fbdev_read_header, + .read_packet = fbdev_read_packet, + .read_close = fbdev_read_close, + .flags = AVFMT_NOFILE, +}; From 42315dabce376fd7085e2a1bbab4d230d3d2ccd8 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 15 Mar 2011 09:37:48 +0100 Subject: [PATCH 4/5] Chronomaster DFA decoder Signed-off-by: Anton Khirnov --- Changelog | 1 + doc/general.texi | 4 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/dfa.c | 395 +++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/dfa.c | 119 ++++++++++++ libavformat/version.h | 2 +- 11 files changed, 526 insertions(+), 2 deletions(-) create mode 100644 libavcodec/dfa.c create mode 100644 libavformat/dfa.c diff --git a/Changelog b/Changelog index 86db2aef0e..9fd22fe361 100644 --- a/Changelog +++ b/Changelog @@ -81,6 +81,7 @@ version : - Apple HTTP Live Streaming protocol handler - sndio support for playback and record - Linux framebuffer input device added +- Chronomaster DFA decoder version 0.6: diff --git a/doc/general.texi b/doc/general.texi index 4636471eee..7d5f082477 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -81,6 +81,8 @@ library: @tab Audio format used in some games by CRYO Interactive Entertainment. @item D-Cinema audio @tab X @tab X @item Deluxe Paint Animation @tab @tab X +@item DFA @tab @tab X + @tab This format is used in Chronomaster game @item DV video @tab X @tab X @item DXA @tab @tab X @tab This format is used in the non-Windows version of the Feeble Files @@ -371,6 +373,8 @@ following image formats are supported: @item Cirrus Logic AccuPak @tab @tab X @tab fourcc: CLJR @item Creative YUV (CYUV) @tab @tab X +@item DFA @tab @tab X + @tab Codec used in Chronomaster game. @item Dirac @tab E @tab E @tab supported through external libdirac/libschroedinger libraries @item Deluxe Paint Animation @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 85d9a34f3e..4cb61ca21e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -103,6 +103,7 @@ OBJS-$(CONFIG_COOK_DECODER) += cook.o OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dca.o synth_filter.o dcadsp.o +OBJS-$(CONFIG_DFA_DECODER) += dfa.o OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o \ mpegvideo_enc.o motion_est.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 8de6ad8429..9aa29b7e3c 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -88,6 +88,7 @@ void avcodec_register_all(void) REGISTER_DECODER (CLJR, cljr); REGISTER_DECODER (CSCD, cscd); REGISTER_DECODER (CYUV, cyuv); + REGISTER_DECODER (DFA, dfa); REGISTER_ENCDEC (DNXHD, dnxhd); REGISTER_DECODER (DPX, dpx); REGISTER_DECODER (DSICINVIDEO, dsicinvideo); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 150c99df1d..4cd78a373e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -212,6 +212,7 @@ enum CodecID { CODEC_ID_LAGARITH, CODEC_ID_PRORES, CODEC_ID_JV, + CODEC_ID_DFA, /* various PCM "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c new file mode 100644 index 0000000000..1023197c38 --- /dev/null +++ b/libavcodec/dfa.c @@ -0,0 +1,395 @@ +/* + * Chronomaster DFA Video Decoder + * Copyright (c) 2011 Konstantin Shishkov + * based on work by Vladimir "VAG" Gneushev + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "libavutil/intreadwrite.h" +#include "bytestream.h" +#include "libavutil/lzo.h" // for av_memcpy_backptr + +typedef struct DfaContext { + AVFrame pic; + + uint32_t pal[256]; + uint8_t *frame_buf; +} DfaContext; + +static av_cold int dfa_decode_init(AVCodecContext *avctx) +{ + DfaContext *s = avctx->priv_data; + + avctx->pix_fmt = PIX_FMT_PAL8; + + s->frame_buf = av_mallocz(avctx->width * avctx->height + AV_LZO_OUTPUT_PADDING); + if (!s->frame_buf) + return AVERROR(ENOMEM); + + return 0; +} + +static int decode_copy(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + const int size = width * height; + + if (src_end - src < size) + return -1; + bytestream_get_buffer(&src, frame, size); + return 0; +} + +static int decode_tsw1(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + const uint8_t *frame_start = frame; + const uint8_t *frame_end = frame + width * height; + int mask = 0x10000, bitbuf = 0; + int v, offset, count, segments; + + segments = bytestream_get_le32(&src); + frame += bytestream_get_le32(&src); + if (frame < frame_start || frame > frame_end) + return -1; + while (segments--) { + if (mask == 0x10000) { + if (src >= src_end) + return -1; + bitbuf = bytestream_get_le16(&src); + mask = 1; + } + if (src_end - src < 2 || frame_end - frame < 2) + return -1; + if (bitbuf & mask) { + v = bytestream_get_le16(&src); + offset = (v & 0x1FFF) << 1; + count = ((v >> 13) + 2) << 1; + if (frame - offset < frame_start || frame_end - frame < count) + return -1; + av_memcpy_backptr(frame, offset, count); + frame += count; + } else { + *frame++ = *src++; + *frame++ = *src++; + } + mask <<= 1; + } + + return 0; +} + +static int decode_dsw1(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + const uint8_t *frame_start = frame; + const uint8_t *frame_end = frame + width * height; + int mask = 0x10000, bitbuf = 0; + int v, offset, count, segments; + + segments = bytestream_get_le16(&src); + while (segments--) { + if (mask == 0x10000) { + if (src >= src_end) + return -1; + bitbuf = bytestream_get_le16(&src); + mask = 1; + } + if (src_end - src < 2 || frame_end - frame < 2) + return -1; + if (bitbuf & mask) { + v = bytestream_get_le16(&src); + offset = (v & 0x1FFF) << 1; + count = ((v >> 13) + 2) << 1; + if (frame - offset < frame_start || frame_end - frame < count) + return -1; + // can't use av_memcpy_backptr() since it can overwrite following pixels + for (v = 0; v < count; v++) + frame[v] = frame[v - offset]; + frame += count; + } else if (bitbuf & (mask << 1)) { + frame += bytestream_get_le16(&src); + } else { + *frame++ = *src++; + *frame++ = *src++; + } + mask <<= 2; + } + + return 0; +} + +static int decode_dds1(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + const uint8_t *frame_start = frame; + const uint8_t *frame_end = frame + width * height; + int mask = 0x10000, bitbuf = 0; + int i, v, offset, count, segments; + + segments = bytestream_get_le16(&src); + while (segments--) { + if (mask == 0x10000) { + if (src >= src_end) + return -1; + bitbuf = bytestream_get_le16(&src); + mask = 1; + } + if (src_end - src < 2 || frame_end - frame < 2) + return -1; + if (bitbuf & mask) { + v = bytestream_get_le16(&src); + offset = (v & 0x1FFF) << 2; + count = ((v >> 13) + 2) << 1; + if (frame - offset < frame_start || frame_end - frame < count*2 + width) + return -1; + for (i = 0; i < count; i++) { + frame[0] = frame[1] = + frame[width] = frame[width + 1] = frame[-offset]; + + frame += 2; + } + } else if (bitbuf & (mask << 1)) { + frame += bytestream_get_le16(&src) * 2; + } else { + frame[0] = frame[1] = + frame[width] = frame[width + 1] = *src++; + frame += 2; + frame[0] = frame[1] = + frame[width] = frame[width + 1] = *src++; + frame += 2; + } + mask <<= 2; + } + + return 0; +} + +static int decode_bdlt(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + const uint8_t *frame_end = frame + width * height; + uint8_t *line_ptr; + int count, lines, segments; + + count = bytestream_get_le16(&src); + if (count >= height || width * count < 0) + return -1; + frame += width * count; + lines = bytestream_get_le16(&src); + if (frame + lines * width > frame_end || src >= src_end) + return -1; + + while (lines--) { + line_ptr = frame; + frame += width; + segments = *src++; + while (segments--) { + if (src_end - src < 3) + return -1; + line_ptr += *src++; + if (line_ptr >= frame) + return -1; + count = (int8_t)*src++; + if (count >= 0) { + if (line_ptr + count > frame || src_end - src < count) + return -1; + bytestream_get_buffer(&src, line_ptr, count); + } else { + count = -count; + if (line_ptr + count > frame || src >= src_end) + return -1; + memset(line_ptr, *src++, count); + } + line_ptr += count; + } + } + + return 0; +} + +static int decode_wdlt(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + const uint8_t *frame_end = frame + width * height; + uint8_t *line_ptr; + int count, i, v, lines, segments; + + lines = bytestream_get_le16(&src); + if (frame + lines * width > frame_end || src >= src_end) + return -1; + + while (lines--) { + segments = bytestream_get_le16(&src); + while ((segments & 0xC000) == 0xC000) { + frame -= (int16_t)segments * width; + if (frame >= frame_end) + return -1; + segments = bytestream_get_le16(&src); + } + if (segments & 0x8000) { + frame[width - 1] = segments & 0xFF; + segments = bytestream_get_le16(&src); + } + line_ptr = frame; + frame += width; + while (segments--) { + if (src_end - src < 2) + return -1; + line_ptr += *src++; + if (line_ptr >= frame) + return -1; + count = (int8_t)*src++; + if (count >= 0) { + if (line_ptr + count*2 > frame || src_end - src < count*2) + return -1; + bytestream_get_buffer(&src, line_ptr, count*2); + line_ptr += count * 2; + } else { + count = -count; + if (line_ptr + count*2 > frame || src_end - src < 2) + return -1; + v = bytestream_get_le16(&src); + for (i = 0; i < count; i++) + bytestream_put_le16(&line_ptr, v); + } + } + } + + return 0; +} + +static int decode_unk6(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + return -1; +} + +static int decode_blck(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end) +{ + memset(frame, 0, width * height); + return 0; +} + + +typedef int (*chunk_decoder)(uint8_t *frame, int width, int height, + const uint8_t *src, const uint8_t *src_end); + +static const chunk_decoder decoder[8] = { + decode_copy, decode_tsw1, decode_bdlt, decode_wdlt, + decode_unk6, decode_dsw1, decode_blck, decode_dds1, +}; + +static const char* chunk_name[8] = { + "COPY", "TSW1", "BDLT", "WDLT", "????", "DSW1", "BLCK", "DDS1" +}; + +static int dfa_decode_frame(AVCodecContext *avctx, + void *data, int *data_size, + AVPacket *avpkt) +{ + DfaContext *s = avctx->priv_data; + const uint8_t *buf = avpkt->data; + const uint8_t *buf_end = avpkt->data + avpkt->size; + const uint8_t *tmp_buf; + uint32_t chunk_type, chunk_size; + uint8_t *dst; + int ret; + int i, pal_elems; + + if (s->pic.data[0]) + avctx->release_buffer(avctx, &s->pic); + + if ((ret = avctx->get_buffer(avctx, &s->pic))) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; + } + + while (buf < buf_end) { + chunk_size = AV_RL32(buf + 4); + chunk_type = AV_RL32(buf + 8); + buf += 12; + if (buf_end - buf < chunk_size) { + av_log(avctx, AV_LOG_ERROR, "Chunk size is too big (%d bytes)\n", chunk_size); + return -1; + } + if (!chunk_type) + break; + if (chunk_type == 1) { + pal_elems = FFMIN(chunk_size / 3, 256); + tmp_buf = buf; + for (i = 0; i < pal_elems; i++) { + s->pal[i] = bytestream_get_be24(&tmp_buf) << 2; + s->pal[i] |= (s->pal[i] >> 6) & 0x333; + } + s->pic.palette_has_changed = 1; + } else if (chunk_type <= 9) { + if (decoder[chunk_type - 2](s->frame_buf, avctx->width, avctx->height, + buf, buf + chunk_size)) { + av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n", + chunk_name[chunk_type - 2]); + return -1; + } + } else { + av_log(avctx, AV_LOG_WARNING, "Ignoring unknown chunk type %d\n", + chunk_type); + } + buf += chunk_size; + } + + buf = s->frame_buf; + dst = s->pic.data[0]; + for (i = 0; i < avctx->height; i++) { + memcpy(dst, buf, avctx->width); + dst += s->pic.linesize[0]; + buf += avctx->width; + } + memcpy(s->pic.data[1], s->pal, sizeof(s->pal)); + + *data_size = sizeof(AVFrame); + *(AVFrame*)data = s->pic; + + return avpkt->size; +} + +static av_cold int dfa_decode_end(AVCodecContext *avctx) +{ + DfaContext *s = avctx->priv_data; + + if (s->pic.data[0]) + avctx->release_buffer(avctx, &s->pic); + + av_freep(&s->frame_buf); + + return 0; +} + +AVCodec ff_dfa_decoder = { + "dfa", + AVMEDIA_TYPE_VIDEO, + CODEC_ID_DFA, + sizeof(DfaContext), + dfa_decode_init, + NULL, + dfa_decode_end, + dfa_decode_frame, + CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 73a6f3382d..a1c8365e5c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 115 +#define LIBAVCODEC_VERSION_MINOR 116 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/Makefile b/libavformat/Makefile index c521cd384c..719783c62d 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -55,6 +55,7 @@ OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o OBJS-$(CONFIG_DAUD_MUXER) += daud.o +OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o OBJS-$(CONFIG_DIRAC_MUXER) += rawenc.o OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d6cab7a499..e80d4b0175 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -75,6 +75,7 @@ void av_register_all(void) REGISTER_DEMUXER (CDG, cdg); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); + REGISTER_DEMUXER (DFA, dfa); REGISTER_MUXDEMUX (DIRAC, dirac); REGISTER_MUXDEMUX (DNXHD, dnxhd); REGISTER_DEMUXER (DSICIN, dsicin); diff --git a/libavformat/dfa.c b/libavformat/dfa.c new file mode 100644 index 0000000000..810853568d --- /dev/null +++ b/libavformat/dfa.c @@ -0,0 +1,119 @@ +/* + * Chronomaster DFA Format Demuxer + * Copyright (c) 2011 Konstantin Shishkov + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "avformat.h" + +static int dfa_probe(AVProbeData *p) +{ + if (p->buf_size < 4 || AV_RL32(p->buf) != MKTAG('D', 'F', 'I', 'A')) + return 0; + + return AVPROBE_SCORE_MAX; +} + +static int dfa_read_header(AVFormatContext *s, + AVFormatParameters *ap) +{ + AVIOContext *pb = s->pb; + AVStream *st; + int frames; + uint32_t mspf; + + if (avio_rl32(pb) != MKTAG('D', 'F', 'I', 'A')) { + av_log(s, AV_LOG_ERROR, "Invalid magic for DFA\n"); + return AVERROR_INVALIDDATA; + } + avio_skip(pb, 2); // unused + frames = avio_rl16(pb); + + st = av_new_stream(s, 0); + if (!st) + return AVERROR(ENOMEM); + + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_DFA; + st->codec->width = avio_rl16(pb); + st->codec->height = avio_rl16(pb); + mspf = avio_rl32(pb); + if (!mspf) { + av_log(s, AV_LOG_WARNING, "Zero FPS reported, defaulting to 10\n"); + mspf = 100; + } + av_set_pts_info(st, 24, mspf, 1000); + avio_skip(pb, 128 - 16); // padding + st->duration = frames; + + return 0; +} + +static int dfa_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVIOContext *pb = s->pb; + uint32_t frame_size; + int ret, first = 1; + + if (pb->eof_reached) + return AVERROR_EOF; + + if (av_get_packet(pb, pkt, 12) != 12) + return AVERROR(EIO); + while (!pb->eof_reached) { + if (!first) { + ret = av_append_packet(pb, pkt, 12); + if (ret < 0) { + av_free_packet(pkt); + return ret; + } + } else + first = 0; + frame_size = AV_RL32(pkt->data + pkt->size - 8); + if (frame_size > INT_MAX - 4) { + av_log(s, AV_LOG_ERROR, "Too large chunk size: %d\n", frame_size); + return AVERROR(EIO); + } + if (AV_RL32(pkt->data + pkt->size - 12) == MKTAG('E', 'O', 'F', 'R')) { + if (frame_size) { + av_log(s, AV_LOG_WARNING, "skipping %d bytes of end-of-frame marker chunk\n", + frame_size); + avio_skip(pb, frame_size); + } + return 0; + } + ret = av_append_packet(pb, pkt, frame_size); + if (ret < 0) { + av_free_packet(pkt); + return ret; + } + } + + return 0; +} + +AVInputFormat ff_dfa_demuxer = { + "dfa", + NULL_IF_CONFIG_SMALL("Chronomaster DFA"), + 0, + dfa_probe, + dfa_read_header, + dfa_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; diff --git a/libavformat/version.h b/libavformat/version.h index e52290f879..7d61bef3f6 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -24,7 +24,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 103 +#define LIBAVFORMAT_VERSION_MINOR 104 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ From c4549bd66a94bec1284dcca0da19e5038a82cbe3 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 28 Mar 2011 14:01:27 -0400 Subject: [PATCH 5/5] ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks. --- libavcodec/ac3enc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index f7a366b07d..c641400a2d 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -112,6 +112,7 @@ typedef struct AC3Block { uint8_t coeff_shift[AC3_MAX_CHANNELS]; ///< fixed-point coefficient shift values uint8_t new_rematrixing_strategy; ///< send new rematrixing flags in this block uint8_t rematrixing_flags[4]; ///< rematrixing flags + struct AC3Block *exp_ref_block[AC3_MAX_CHANNELS]; ///< reference blocks for EXP_REUSE } AC3Block; /** @@ -692,7 +693,7 @@ static void encode_exponents_blk_ch(uint8_t *exp, int nb_exps, int exp_strategy) static void encode_exponents(AC3EncodeContext *s) { int blk, blk1, ch; - uint8_t *exp, *exp1, *exp_strategy; + uint8_t *exp, *exp_strategy; int nb_coefs, num_reuse_blocks; for (ch = 0; ch < s->channels; ch++) { @@ -704,9 +705,13 @@ static void encode_exponents(AC3EncodeContext *s) while (blk < AC3_MAX_BLOCKS) { blk1 = blk + 1; - /* count the number of EXP_REUSE blocks after the current block */ - while (blk1 < AC3_MAX_BLOCKS && exp_strategy[blk1] == EXP_REUSE) + /* count the number of EXP_REUSE blocks after the current block + and set exponent reference block pointers */ + s->blocks[blk].exp_ref_block[ch] = &s->blocks[blk]; + while (blk1 < AC3_MAX_BLOCKS && exp_strategy[blk1] == EXP_REUSE) { + s->blocks[blk1].exp_ref_block[ch] = &s->blocks[blk]; blk1++; + } num_reuse_blocks = blk1 - blk - 1; /* for the EXP_REUSE case we select the min of the exponents */ @@ -714,15 +719,8 @@ static void encode_exponents(AC3EncodeContext *s) encode_exponents_blk_ch(exp, nb_coefs, exp_strategy[blk]); - /* copy encoded exponents for reuse case */ - exp1 = exp + AC3_MAX_COEFS; - while (blk < blk1-1) { - memcpy(exp1, exp, nb_coefs * sizeof(*exp)); - exp1 += AC3_MAX_COEFS; - blk++; - } + exp += AC3_MAX_COEFS * (num_reuse_blocks + 1); blk = blk1; - exp = exp1; } } } @@ -1035,7 +1033,7 @@ static int bit_alloc(AC3EncodeContext *s, int snr_offset) reset_block_bap(s); mantissa_bits = 0; for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) { - AC3Block *block = &s->blocks[blk]; + AC3Block *block; // initialize grouped mantissa counts. these are set so that they are // padded to the next whole group size when bits are counted in // compute_mantissa_size_final @@ -1047,9 +1045,8 @@ static int bit_alloc(AC3EncodeContext *s, int snr_offset) blocks within a frame are the exponent values. We can take advantage of that by reusing the bit allocation pointers whenever we reuse exponents. */ - if (s->exp_strategy[ch][blk] == EXP_REUSE) { - memcpy(block->bap[ch], s->blocks[blk-1].bap[ch], AC3_MAX_COEFS); - } else { + block = s->blocks[blk].exp_ref_block[ch]; + if (s->exp_strategy[ch][blk] != EXP_REUSE) { ff_ac3_bit_alloc_calc_bap(block->mask[ch], block->psd[ch], 0, s->nb_coefs[ch], snr_offset, s->bit_alloc.floor, ff_ac3_bap_tab, @@ -1352,12 +1349,14 @@ static void quantize_mantissas(AC3EncodeContext *s) for (blk = 0; blk < AC3_MAX_BLOCKS; blk++) { AC3Block *block = &s->blocks[blk]; + AC3Block *ref_block; s->mant1_cnt = s->mant2_cnt = s->mant4_cnt = 0; s->qmant1_ptr = s->qmant2_ptr = s->qmant4_ptr = NULL; for (ch = 0; ch < s->channels; ch++) { + ref_block = block->exp_ref_block[ch]; quantize_mantissas_blk_ch(s, block->fixed_coef[ch], - block->exp[ch], block->bap[ch], + ref_block->exp[ch], ref_block->bap[ch], block->qmant[ch], s->nb_coefs[ch]); } } @@ -1516,9 +1515,10 @@ static void output_audio_block(AC3EncodeContext *s, int blk) /* mantissas */ for (ch = 0; ch < s->channels; ch++) { int b, q; + AC3Block *ref_block = block->exp_ref_block[ch]; for (i = 0; i < s->nb_coefs[ch]; i++) { q = block->qmant[ch][i]; - b = block->bap[ch][i]; + b = ref_block->bap[ch][i]; switch (b) { case 0: break; case 1: if (q != 128) put_bits(&s->pb, 5, q); break;