mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
653d117c29
* qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
134 lines
3.7 KiB
C
134 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com >
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* data structures common to libschroedinger decoder and encoder
|
|
*/
|
|
|
|
#ifndef AVCODEC_LIBSCHROEDINGER_H
|
|
#define AVCODEC_LIBSCHROEDINGER_H
|
|
|
|
#include <schroedinger/schrobitstream.h>
|
|
#include <schroedinger/schroframe.h>
|
|
|
|
#include "avcodec.h"
|
|
|
|
typedef struct {
|
|
uint16_t width;
|
|
uint16_t height;
|
|
uint16_t frame_rate_num;
|
|
uint16_t frame_rate_denom;
|
|
} SchroVideoFormatInfo;
|
|
|
|
/**
|
|
* contains a single encoded frame returned from Dirac or Schroedinger
|
|
*/
|
|
typedef struct FFSchroEncodedFrame {
|
|
/** encoded frame data */
|
|
uint8_t *p_encbuf;
|
|
|
|
/** encoded frame size */
|
|
uint32_t size;
|
|
|
|
/** encoded frame number. Will be used as pts */
|
|
uint32_t frame_num;
|
|
|
|
/** key frame flag. 1 : is key frame , 0 : in not key frame */
|
|
uint16_t key_frame;
|
|
} FFSchroEncodedFrame;
|
|
|
|
/**
|
|
* queue element
|
|
*/
|
|
typedef struct FFSchroQueueElement {
|
|
/** Data to be stored in queue*/
|
|
void *data;
|
|
/** Pointer to next element queue */
|
|
struct FFSchroQueueElement *next;
|
|
} FFSchroQueueElement;
|
|
|
|
|
|
/**
|
|
* A simple queue implementation used in libschroedinger
|
|
*/
|
|
typedef struct FFSchroQueue {
|
|
/** Pointer to head of queue */
|
|
FFSchroQueueElement *p_head;
|
|
/** Pointer to tail of queue */
|
|
FFSchroQueueElement *p_tail;
|
|
/** Queue size*/
|
|
int size;
|
|
} FFSchroQueue;
|
|
|
|
/**
|
|
* Initialise the queue
|
|
*/
|
|
void ff_schro_queue_init(FFSchroQueue *queue);
|
|
|
|
/**
|
|
* Add an element to the end of the queue
|
|
*/
|
|
int ff_schro_queue_push_back(FFSchroQueue *queue, void *p_data);
|
|
|
|
/**
|
|
* Return the first element in the queue
|
|
*/
|
|
void *ff_schro_queue_pop(FFSchroQueue *queue);
|
|
|
|
/**
|
|
* Free the queue resources. free_func is a function supplied by the caller to
|
|
* free any resources allocated by the caller. The data field of the queue
|
|
* element is passed to it.
|
|
*/
|
|
void ff_schro_queue_free(FFSchroQueue *queue, void (*free_func)(void *));
|
|
|
|
static const struct {
|
|
enum PixelFormat ff_pix_fmt;
|
|
SchroChromaFormat schro_pix_fmt;
|
|
SchroFrameFormat schro_frame_fmt;
|
|
} schro_pixel_format_map[] = {
|
|
{ PIX_FMT_YUV420P, SCHRO_CHROMA_420, SCHRO_FRAME_FORMAT_U8_420 },
|
|
{ PIX_FMT_YUV422P, SCHRO_CHROMA_422, SCHRO_FRAME_FORMAT_U8_422 },
|
|
{ PIX_FMT_YUV444P, SCHRO_CHROMA_444, SCHRO_FRAME_FORMAT_U8_444 },
|
|
};
|
|
|
|
/**
|
|
* Returns the video format preset matching the input video dimensions and
|
|
* time base.
|
|
*/
|
|
SchroVideoFormatEnum ff_get_schro_video_format_preset (AVCodecContext *avccontext);
|
|
|
|
/**
|
|
* Sets the Schroedinger frame format corresponding to the Schro chroma format
|
|
* passed. Returns 0 on success, -1 on failure.
|
|
*/
|
|
int ff_get_schro_frame_format(SchroChromaFormat schro_chroma_fmt,
|
|
SchroFrameFormat *schro_frame_fmt);
|
|
|
|
/**
|
|
* Create a Schro frame based on the dimensions and frame format
|
|
* passed. Returns a pointer to a frame on success, NULL on failure.
|
|
*/
|
|
SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
|
|
SchroFrameFormat schro_frame_fmt);
|
|
|
|
#endif /* AVCODEC_LIBSCHROEDINGER_H */
|