* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/intmath.h"
#include "avcodec.h"
#include "bytestream.h"
+#include "internal.h"
+#include "mathops.h"
-#define ROQ_FIRST_FRAME_SIZE (735*8)
#define ROQ_FRAME_SIZE 735
-
+#define ROQ_HEADER_SIZE 8
#define MAX_DPCM (127*127)
typedef struct
{
short lastSample[2];
+ int input_frames;
+ int buffered_samples;
+ int16_t *frame_buffer;
+ int64_t first_pts;
} ROQDPCMContext;
+
+static av_cold int roq_dpcm_encode_close(AVCodecContext *avctx)
+{
+ ROQDPCMContext *context = avctx->priv_data;
+
+ av_freep(&context->frame_buffer);
+
+ return 0;
+}
+
static av_cold int roq_dpcm_encode_init(AVCodecContext *avctx)
{
ROQDPCMContext *context = avctx->priv_data;
+ int ret;
if (avctx->channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Audio must be mono or stereo\n");
- return -1;
+ return AVERROR(EINVAL);
}
if (avctx->sample_rate != 22050) {
av_log(avctx, AV_LOG_ERROR, "Audio must be 22050 Hz\n");
- return -1;
- }
- if (avctx->sample_fmt != AV_SAMPLE_FMT_S16) {
- av_log(avctx, AV_LOG_ERROR, "Audio must be signed 16-bit\n");
- return -1;
+ return AVERROR(EINVAL);
}
- avctx->frame_size = ROQ_FIRST_FRAME_SIZE;
+ avctx->frame_size = ROQ_FRAME_SIZE;
+ avctx->bit_rate = (ROQ_HEADER_SIZE + ROQ_FRAME_SIZE * avctx->channels) *
+ (22050 / ROQ_FRAME_SIZE) * 8;
+
+ context->frame_buffer = av_malloc(8 * ROQ_FRAME_SIZE * avctx->channels *
+ sizeof(*context->frame_buffer));
+ if (!context->frame_buffer) {
+ ret = AVERROR(ENOMEM);
+ goto error;
+ }
context->lastSample[0] = context->lastSample[1] = 0;
- avctx->coded_frame= avcodec_alloc_frame();
-
return 0;
+error:
+ roq_dpcm_encode_close(avctx);
+ return ret;
}
static unsigned char dpcm_predict(short *previous, short current)
return result;
}
-static int roq_dpcm_encode_frame(AVCodecContext *avctx,
- unsigned char *frame, int buf_size, void *data)
+static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr)
{
- int i, samples, stereo, ch;
- const short *in;
- unsigned char *out;
-
+ int i, stereo, data_size, ret;
+ const int16_t *in = frame ? (const int16_t *)frame->data[0] : NULL;
+ uint8_t *out;
ROQDPCMContext *context = avctx->priv_data;
stereo = (avctx->channels == 2);
+ if (!in && context->input_frames >= 8)
+ return 0;
+
+ if (in && context->input_frames < 8) {
+ memcpy(&context->frame_buffer[context->buffered_samples * avctx->channels],
+ in, avctx->frame_size * avctx->channels * sizeof(*in));
+ context->buffered_samples += avctx->frame_size;
+ if (context->input_frames == 0)
+ context->first_pts = frame->pts;
+ if (context->input_frames < 7) {
+ context->input_frames++;
+ return 0;
+ }
+ in = context->frame_buffer;
+ }
+
if (stereo) {
context->lastSample[0] &= 0xFF00;
context->lastSample[1] &= 0xFF00;
}
- out = frame;
- in = data;
+ if (context->input_frames == 7 || !in)
+ data_size = avctx->channels * context->buffered_samples;
+ else
+ data_size = avctx->channels * avctx->frame_size;
+
+ if ((ret = ff_alloc_packet(avpkt, ROQ_HEADER_SIZE + data_size))) {
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
+ return ret;
+ }
+ out = avpkt->data;
bytestream_put_byte(&out, stereo ? 0x21 : 0x20);
bytestream_put_byte(&out, 0x10);
- bytestream_put_le32(&out, avctx->frame_size*avctx->channels);
+ bytestream_put_le32(&out, data_size);
if (stereo) {
bytestream_put_byte(&out, (context->lastSample[1])>>8);
bytestream_put_le16(&out, context->lastSample[0]);
/* Write the actual samples */
- samples = avctx->frame_size;
- for (i=0; i<samples; i++)
- for (ch=0; ch<avctx->channels; ch++)
- *out++ = dpcm_predict(&context->lastSample[ch], *in++);
-
- /* Use smaller frames from now on */
- avctx->frame_size = ROQ_FRAME_SIZE;
+ for (i = 0; i < data_size; i++)
+ *out++ = dpcm_predict(&context->lastSample[i & 1], *in++);
- /* Return the result size */
- return out - frame;
-}
+ avpkt->pts = context->input_frames <= 7 ? context->first_pts : frame->pts;
+ avpkt->duration = data_size / avctx->channels;
-static av_cold int roq_dpcm_encode_close(AVCodecContext *avctx)
-{
- av_freep(&avctx->coded_frame);
+ context->input_frames++;
+ if (!in)
+ context->input_frames = FFMAX(context->input_frames, 8);
+ *got_packet_ptr = 1;
return 0;
}
AVCodec ff_roq_dpcm_encoder = {
.name = "roq_dpcm",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_ROQ_DPCM,
+ .id = AV_CODEC_ID_ROQ_DPCM,
.priv_data_size = sizeof(ROQDPCMContext),
.init = roq_dpcm_encode_init,
- .encode = roq_dpcm_encode_frame,
+ .encode2 = roq_dpcm_encode_frame,
.close = roq_dpcm_encode_close,
- .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
+ .capabilities = CODEC_CAP_DELAY,
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+ AV_SAMPLE_FMT_NONE },
+ .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
};