* Dirac decoder support via Schroedinger libraries
* Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com >
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * 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.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
-* @file libavcodec/libschroedingerdec.c
+* @file
* Dirac decoder support via libschroedinger-1.0 libraries. More details about
* the Schroedinger project can be found at http://www.diracvideo.org/.
* The library implements Dirac Specification Version 2.2.
* (http://dirac.sourceforge.net/specification.html).
*/
+#include "libavutil/imgutils.h"
#include "avcodec.h"
-#include "libdirac_libschro.h"
#include "libschroedinger.h"
#undef NDEBUG
#include <schroedinger/schrovideoformat.h>
/** libschroedinger decoder private data */
-typedef struct FfmpegSchroDecoderParams {
+typedef struct SchroDecoderParams {
/** Schroedinger video format */
SchroVideoFormat *format;
SchroDecoder* decoder;
/** queue storing decoded frames */
- FfmpegDiracSchroQueue dec_frame_queue;
+ FFSchroQueue dec_frame_queue;
/** end of sequence signalled */
int eos_signalled;
/** decoded picture */
AVPicture dec_pic;
-} FfmpegSchroDecoderParams;
+} SchroDecoderParams;
-typedef struct FfmpegSchroParseUnitContext {
+typedef struct SchroParseUnitContext {
const uint8_t *buf;
int buf_size;
-} FfmpegSchroParseUnitContext;
+} SchroParseUnitContext;
static void libschroedinger_decode_buffer_free(SchroBuffer *schro_buf,
- void *priv);
+ void *priv)
+{
+ av_freep(&priv);
+}
-static void FfmpegSchroParseContextInit(FfmpegSchroParseUnitContext *parse_ctx,
- const uint8_t *buf, int buf_size)
+static void parse_context_init(SchroParseUnitContext *parse_ctx,
+ const uint8_t *buf, int buf_size)
{
parse_ctx->buf = buf;
parse_ctx->buf_size = buf_size;
}
-static SchroBuffer* FfmpegFindNextSchroParseUnit(FfmpegSchroParseUnitContext *parse_ctx)
+static SchroBuffer *find_next_parse_unit(SchroParseUnitContext *parse_ctx)
{
SchroBuffer *enc_buf = NULL;
int next_pu_offset = 0;
return NULL;
in_buf = av_malloc(next_pu_offset);
+ if (!in_buf) {
+ av_log(parse_ctx, AV_LOG_ERROR, "Unable to allocate input buffer\n");
+ return NULL;
+ }
+
memcpy(in_buf, parse_ctx->buf, next_pu_offset);
enc_buf = schro_buffer_new_with_data(in_buf, next_pu_offset);
enc_buf->free = libschroedinger_decode_buffer_free;
}
/**
-* Returns FFmpeg chroma format.
+* Returns Libav chroma format.
*/
-static enum PixelFormat GetFfmpegChromaFormat(SchroChromaFormat schro_pix_fmt)
+static enum PixelFormat get_chroma_format(SchroChromaFormat schro_pix_fmt)
{
- int num_formats = sizeof(ffmpeg_schro_pixel_format_map) /
- sizeof(ffmpeg_schro_pixel_format_map[0]);
+ int num_formats = sizeof(schro_pixel_format_map) /
+ sizeof(schro_pixel_format_map[0]);
int idx;
for (idx = 0; idx < num_formats; ++idx)
- if (ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt)
- return ffmpeg_schro_pixel_format_map[idx].ff_pix_fmt;
+ if (schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt)
+ return schro_pixel_format_map[idx].ff_pix_fmt;
return PIX_FMT_NONE;
}
static av_cold int libschroedinger_decode_init(AVCodecContext *avccontext)
{
- FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avccontext->priv_data;
/* First of all, initialize our supporting libraries. */
schro_init();
return -1;
/* Initialize the decoded frame queue. */
- ff_dirac_schro_queue_init(&p_schro_params->dec_frame_queue);
+ ff_schro_queue_init(&p_schro_params->dec_frame_queue);
return 0;
}
-static void libschroedinger_decode_buffer_free(SchroBuffer *schro_buf,
- void *priv)
-{
- av_freep(&priv);
-}
-
static void libschroedinger_decode_frame_free(void *frame)
{
schro_frame_unref(frame);
static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext)
{
- FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avccontext->priv_data;
SchroDecoder *decoder = p_schro_params->decoder;
p_schro_params->format = schro_decoder_get_video_format(decoder);
- /* Tell FFmpeg about sequence details. */
- if (avcodec_check_dimensions(avccontext, p_schro_params->format->width,
- p_schro_params->format->height) < 0) {
+ /* Tell Libav about sequence details. */
+ if (av_image_check_size(p_schro_params->format->width, p_schro_params->format->height,
+ 0, avccontext) < 0) {
av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
p_schro_params->format->width, p_schro_params->format->height);
avccontext->height = avccontext->width = 0;
}
avccontext->height = p_schro_params->format->height;
avccontext->width = p_schro_params->format->width;
- avccontext->pix_fmt = GetFfmpegChromaFormat(p_schro_params->format->chroma_format);
+ avccontext->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format);
if (ff_get_schro_frame_format(p_schro_params->format->chroma_format,
&p_schro_params->frame_format) == -1) {
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avccontext->priv_data;
SchroDecoder *decoder = p_schro_params->decoder;
- SchroVideoFormat *format;
AVPicture *picture = data;
SchroBuffer *enc_buf;
SchroFrame* frame;
int state;
int go = 1;
int outer = 1;
- FfmpegSchroParseUnitContext parse_ctx;
+ SchroParseUnitContext parse_ctx;
*data_size = 0;
- FfmpegSchroParseContextInit(&parse_ctx, buf, buf_size);
+ parse_context_init(&parse_ctx, buf, buf_size);
if (!buf_size) {
if (!p_schro_params->eos_signalled) {
state = schro_decoder_push_end_of_stream(decoder);
/* Loop through all the individual parse units in the input buffer */
do {
- if ((enc_buf = FfmpegFindNextSchroParseUnit(&parse_ctx))) {
+ if ((enc_buf = find_next_parse_unit(&parse_ctx))) {
/* Push buffer into decoder. */
if (SCHRO_PARSE_CODE_IS_PICTURE(enc_buf->data[4]) &&
SCHRO_PARSE_CODE_NUM_REFS(enc_buf->data[4]) > 0)
go = 1;
} else
outer = 0;
- format = p_schro_params->format;
while (go) {
/* Parse data and process result. */
frame = schro_decoder_pull(decoder);
if (frame)
- ff_dirac_schro_queue_push_back(&p_schro_params->dec_frame_queue,
- frame);
+ ff_schro_queue_push_back(&p_schro_params->dec_frame_queue,
+ frame);
break;
case SCHRO_DECODER_EOS:
go = 0;
} while (outer);
/* Grab next frame to be returned from the top of the queue. */
- frame = ff_dirac_schro_queue_pop(&p_schro_params->dec_frame_queue);
+ frame = ff_schro_queue_pop(&p_schro_params->dec_frame_queue);
if (frame) {
memcpy(p_schro_params->dec_pic.data[0],
static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext)
{
- FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avccontext->priv_data;
/* Free the decoder. */
schro_decoder_free(p_schro_params->decoder);
av_freep(&p_schro_params->format);
avpicture_free(&p_schro_params->dec_pic);
/* Free data in the output frame queue. */
- ff_dirac_schro_queue_free(&p_schro_params->dec_frame_queue,
- libschroedinger_decode_frame_free);
+ ff_schro_queue_free(&p_schro_params->dec_frame_queue,
+ libschroedinger_decode_frame_free);
return 0;
}
{
/* Got a seek request. Free the decoded frames queue and then reset
* the decoder */
- FfmpegSchroDecoderParams *p_schro_params = avccontext->priv_data;
+ SchroDecoderParams *p_schro_params = avccontext->priv_data;
/* Free data in the output frame queue. */
- ff_dirac_schro_queue_free(&p_schro_params->dec_frame_queue,
- libschroedinger_decode_frame_free);
+ ff_schro_queue_free(&p_schro_params->dec_frame_queue,
+ libschroedinger_decode_frame_free);
- ff_dirac_schro_queue_init(&p_schro_params->dec_frame_queue);
+ ff_schro_queue_init(&p_schro_params->dec_frame_queue);
schro_decoder_reset(p_schro_params->decoder);
p_schro_params->eos_pulled = 0;
p_schro_params->eos_signalled = 0;
}
-AVCodec libschroedinger_decoder = {
- "libschroedinger",
- CODEC_TYPE_VIDEO,
- CODEC_ID_DIRAC,
- sizeof(FfmpegSchroDecoderParams),
- libschroedinger_decode_init,
- NULL,
- libschroedinger_decode_close,
- libschroedinger_decode_frame,
- CODEC_CAP_DELAY,
- .flush = libschroedinger_flush,
- .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
+AVCodec ff_libschroedinger_decoder = {
+ .name = "libschroedinger",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_DIRAC,
+ .priv_data_size = sizeof(SchroDecoderParams),
+ .init = libschroedinger_decode_init,
+ .close = libschroedinger_decode_close,
+ .decode = libschroedinger_decode_frame,
+ .capabilities = CODEC_CAP_DELAY,
+ .flush = libschroedinger_flush,
+ .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
};
projects / ffmpeg / blobdiff