* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intmath.h"
#include "avcodec.h"
#include "bytestream.h"
#define MAX_DPCM (127*127)
-static unsigned char dpcmValues[MAX_DPCM];
typedef struct
{
short lastSample[2];
-} ROQDPCMContext_t;
+} ROQDPCMContext;
-static av_cold void roq_dpcm_table_init(void)
+static av_cold int roq_dpcm_encode_init(AVCodecContext *avctx)
{
- int i;
-
- /* Create a table of quick DPCM values */
- for (i=0; i<MAX_DPCM; i++) {
- int s= ff_sqrt(i);
- int mid= s*s + s;
- dpcmValues[i]= s + (i>mid);
- }
-}
-
-static int roq_dpcm_encode_init(AVCodecContext *avctx)
-{
- ROQDPCMContext_t *context = avctx->priv_data;
+ ROQDPCMContext *context = avctx->priv_data;
if (avctx->channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Audio must be mono or stereo\n");
av_log(avctx, AV_LOG_ERROR, "Audio must be 22050 Hz\n");
return -1;
}
- if (avctx->sample_fmt != SAMPLE_FMT_S16) {
+ if (avctx->sample_fmt != AV_SAMPLE_FMT_S16) {
av_log(avctx, AV_LOG_ERROR, "Audio must be signed 16-bit\n");
return -1;
}
- roq_dpcm_table_init();
-
avctx->frame_size = ROQ_FIRST_FRAME_SIZE;
context->lastSample[0] = context->lastSample[1] = 0;
if (diff >= MAX_DPCM)
result = 127;
- else
- result = dpcmValues[diff];
+ else {
+ result = ff_sqrt(diff);
+ result += diff > result*result+result;
+ }
/* See if this overflows */
retry:
unsigned char *frame, int buf_size, void *data)
{
int i, samples, stereo, ch;
- short *in;
+ const short *in;
unsigned char *out;
- ROQDPCMContext_t *context = avctx->priv_data;
+ ROQDPCMContext *context = avctx->priv_data;
stereo = (avctx->channels == 2);
return 0;
}
-AVCodec roq_dpcm_encoder = {
+AVCodec ff_roq_dpcm_encoder = {
"roq_dpcm",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_ROQ_DPCM,
- sizeof(ROQDPCMContext_t),
+ sizeof(ROQDPCMContext),
roq_dpcm_encode_init,
roq_dpcm_encode_frame,
roq_dpcm_encode_close,
NULL,
+ .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
};