#include <schroedinger/schrovideoformat.h>
#include "avcodec.h"
+#include "internal.h"
#include "libdirac_libschro.h"
#include "libschroedinger.h"
#include "bytestream.h"
/** libschroedinger encoder private data */
-typedef struct FfmpegSchroEncoderParams {
+typedef struct SchroEncoderParams {
/** Schroedinger video format */
SchroVideoFormat *format;
int enc_buf_size;
/** queue storing encoded frames */
- FfmpegDiracSchroQueue enc_frame_queue;
+ DiracSchroQueue enc_frame_queue;
/** end of sequence signalled */
int eos_signalled;
/** end of sequence pulled */
int eos_pulled;
-} FfmpegSchroEncoderParams;
+
+ /* counter for frames submitted to encoder, used as dts */
+ int64_t dts;
+} SchroEncoderParams;
/**
* Works out Schro-compatible chroma format.
*/
static int SetSchroChromaFormat(AVCodecContext *avccontext)
{
- 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;
- FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avccontext->priv_data;
for (idx = 0; idx < num_formats; ++idx) {
- if (ffmpeg_schro_pixel_format_map[idx].ff_pix_fmt ==
+ if (schro_pixel_format_map[idx].ff_pix_fmt ==
avccontext->pix_fmt) {
p_schro_params->format->chroma_format =
- ffmpeg_schro_pixel_format_map[idx].schro_pix_fmt;
+ schro_pixel_format_map[idx].schro_pix_fmt;
return 0;
}
}
static int libschroedinger_encode_init(AVCodecContext *avccontext)
{
- FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avccontext->priv_data;
SchroVideoFormatEnum preset;
/* Initialize the libraries that libschroedinger depends on. */
schro_encoder_setting_set_double(p_schro_params->encoder,
"au_distance", avccontext->gop_size);
avccontext->has_b_frames = 1;
+ p_schro_params->dts = -1;
}
/* FIXME - Need to handle SCHRO_ENCODER_RATE_CONTROL_LOW_DELAY. */
}
static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext,
- void *in_data)
+ const AVFrame *frame)
{
- FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avccontext->priv_data;
SchroFrame *in_frame;
/* Input line size may differ from what the codec supports. Especially
* when transcoding from one format to another. So use avpicture_layout
in_frame = ff_create_schro_frame(avccontext, p_schro_params->frame_format);
if (in_frame)
- avpicture_layout((AVPicture *)in_data, avccontext->pix_fmt,
+ avpicture_layout((const AVPicture *)frame, avccontext->pix_fmt,
avccontext->width, avccontext->height,
in_frame->components[0].data,
p_schro_params->frame_size);
static void SchroedingerFreeFrame(void *data)
{
- FfmpegDiracSchroEncodedFrame *enc_frame = data;
+ DiracSchroEncodedFrame *enc_frame = data;
- av_freep(&(enc_frame->p_encbuf));
+ av_freep(&enc_frame->p_encbuf);
av_free(enc_frame);
}
-static int libschroedinger_encode_frame(AVCodecContext *avccontext,
- unsigned char *frame,
- int buf_size, void *data)
+static int libschroedinger_encode_frame(AVCodecContext *avccontext, AVPacket *pkt,
+ const AVFrame *frame, int *got_packet)
{
int enc_size = 0;
- FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avccontext->priv_data;
SchroEncoder *encoder = p_schro_params->encoder;
- struct FfmpegDiracSchroEncodedFrame* p_frame_output = NULL;
+ struct DiracSchroEncodedFrame *p_frame_output = NULL;
int go = 1;
SchroBuffer *enc_buf;
int presentation_frame;
int parse_code;
int last_frame_in_sequence = 0;
+ int pkt_size, ret;
- if (!data) {
+ if (!frame) {
/* Push end of sequence if not already signalled. */
if (!p_schro_params->eos_signalled) {
schro_encoder_end_of_stream(encoder);
} else {
/* Allocate frame data to schro input buffer. */
SchroFrame *in_frame = libschroedinger_frame_from_data(avccontext,
- data);
+ frame);
/* Load next frame. */
schro_encoder_push_frame(encoder, in_frame);
}
}
/* Create output frame. */
- p_frame_output = av_mallocz(sizeof(FfmpegDiracSchroEncodedFrame));
+ p_frame_output = av_mallocz(sizeof(DiracSchroEncodedFrame));
/* Set output data. */
p_frame_output->size = p_schro_params->enc_buf_size;
p_frame_output->p_encbuf = p_schro_params->enc_buf;
if (!p_frame_output)
return 0;
- memcpy(frame, p_frame_output->p_encbuf, p_frame_output->size);
+ pkt_size = p_frame_output->size;
+ if (last_frame_in_sequence && p_schro_params->enc_buf_size > 0)
+ pkt_size += p_schro_params->enc_buf_size;
+ if ((ret = ff_alloc_packet(pkt, pkt_size)) < 0) {
+ av_log(avccontext, AV_LOG_ERROR, "Error getting output packet of size %d.\n", pkt_size);
+ goto error;
+ }
+
+ memcpy(pkt->data, p_frame_output->p_encbuf, p_frame_output->size);
avccontext->coded_frame->key_frame = p_frame_output->key_frame;
/* Use the frame number of the encoded frame as the pts. It is OK to
* do so since Dirac is a constant frame rate codec. It expects input
* to be of constant frame rate. */
+ pkt->pts =
avccontext->coded_frame->pts = p_frame_output->frame_num;
+ pkt->dts = p_schro_params->dts++;
enc_size = p_frame_output->size;
/* Append the end of sequence information to the last frame in the
* sequence. */
if (last_frame_in_sequence && p_schro_params->enc_buf_size > 0) {
- memcpy(frame + enc_size, p_schro_params->enc_buf,
+ memcpy(pkt->data + enc_size, p_schro_params->enc_buf,
p_schro_params->enc_buf_size);
enc_size += p_schro_params->enc_buf_size;
av_freep(&p_schro_params->enc_buf);
p_schro_params->enc_buf_size = 0;
}
+ if (p_frame_output->key_frame)
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ *got_packet = 1;
+
+error:
/* free frame */
SchroedingerFreeFrame(p_frame_output);
-
- return enc_size;
+ return ret;
}
static int libschroedinger_encode_close(AVCodecContext *avccontext)
{
-
- FfmpegSchroEncoderParams* p_schro_params = avccontext->priv_data;
+ SchroEncoderParams *p_schro_params = avccontext->priv_data;
/* Close the encoder. */
schro_encoder_free(p_schro_params->encoder);
AVCodec ff_libschroedinger_encoder = {
- "libschroedinger",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_DIRAC,
- sizeof(FfmpegSchroEncoderParams),
- libschroedinger_encode_init,
- libschroedinger_encode_frame,
- libschroedinger_encode_close,
- .capabilities = CODEC_CAP_DELAY,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
+ .name = "libschroedinger",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_DIRAC,
+ .priv_data_size = sizeof(SchroEncoderParams),
+ .init = libschroedinger_encode_init,
+ .encode2 = libschroedinger_encode_frame,
+ .close = libschroedinger_encode_close,
+ .capabilities = CODEC_CAP_DELAY,
+ .pix_fmts = (const enum PixelFormat[]){
+ PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE
+ },
+ .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"),
};
projects / ffmpeg / blobdiff