July 2010 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5853 - libavfilter/diffs/03_doc_filters.diff
by victor 08 Jul '10

08 Jul '10

Author: victor Date: Thu Jul 8 18:40:35 2010 New Revision: 5853 Log: svn-23100 in ffmpeg-trunk superseded -vfilter by -vf Modified: libavfilter/diffs/03_doc_filters.diff Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Thu Jul 8 18:10:38 2010 (r5852) +++ libavfilter/diffs/03_doc_filters.diff Thu Jul 8 18:40:35 2010 (r5853) @@ -9,7 +9,7 @@ Index: doc/filters.texi +@section drawbox + +@example -+./ffmpeg -i in.avi -vfilters "drawbox=10:20:200:60:red" out.avi ++./ffmpeg -i in.avi -vf "drawbox=10:20:200:60:red" out.avi +@end example + +Draw a box with @var{x}:@var{y}:@var{width}:@var{height}:@var{color} @@ -111,7 +111,7 @@ Index: doc/filters.texi +@section fifo + +@example -+./ffmpeg -i in.avi -vfilters "fifo" out.avi ++./ffmpeg -i in.avi -vf "fifo" out.avi +@end example + @section format @@ -124,7 +124,7 @@ Index: doc/filters.texi +@section fps + +@example -+./ffmpeg -i in.avi -vfilters "fps=30000:1001" out.avi ++./ffmpeg -i in.avi -vf "fps=30000:1001" out.avi +@end example + +Modifies the framerate of the input video to a chosen one. @@ -132,7 +132,7 @@ Index: doc/filters.texi +@section hflip + +@example -+./ffmpeg -i in.avi -vfilters "hflip" out.avi ++./ffmpeg -i in.avi -vf "hflip" out.avi +@end example + +Flip the video horizontally. @@ -140,7 +140,7 @@ Index: doc/filters.texi +@section negate + +@example -+./ffmpeg -i in.avi -vfilters "negate" out.avi ++./ffmpeg -i in.avi -vf "negate" out.avi +@end example + +Convert a video to its negative. @@ -212,7 +212,7 @@ Index: doc/filters.texi +@section rotate + +@example -+./ffmpeg -i in.avi -vfilters "rotate=30" out.avi ++./ffmpeg -i in.avi -vf "rotate=30" out.avi +@end example + +Rotate video by a chosen amount in degrees. By default, 45 degrees. @@ -228,16 +228,16 @@ Index: doc/filters.texi + +@example +# Start counting PTS from zero -+ffmpeg -i input.avi -vfilters setpts=PTS-STARTPTS output.avi ++ffmpeg -i input.avi -vf setpts=PTS-STARTPTS output.avi + +# Fast motion -+ffmpeg -i input.avi -vfilters setpts=0.5*PTS output.avi ++ffmpeg -i input.avi -vf setpts=0.5*PTS output.avi + +# Fixed rate 25 fps -+ffmpeg -i input.avi -vfilters setpts=N*AVTB/25 output.avi ++ffmpeg -i input.avi -vf setpts=N*AVTB/25 output.avi + +# Fixed rate 25 fps with some jitter -+ffmpeg -i input.avi -vfilters 'setpts=AVTB/25*(N+0.05*sin(N*2*PI/25))' output.avi ++ffmpeg -i input.avi -vf 'setpts=AVTB/25*(N+0.05*sin(N*2*PI/25))' output.avi +@end example + +Modifies the presentation timestamp (PTS) of the input video. @@ -257,7 +257,7 @@ Index: doc/filters.texi +@section transpose + +@example -+./ffmpeg -i in.avi -vfilters "transpose" out.avi ++./ffmpeg -i in.avi -vf "transpose" out.avi +@end example + +Transpose (line => column) input video to next video filter. @@ -292,7 +292,7 @@ Index: doc/filters.texi +To do that + +@example -+ffmpeg -i in.avi -s 240x320 -vfilters "[in]setpts=PTS-STARTPTS, [T1]overlay=16:16[out]; movie=3200000:avi:in.avi, scale=180:144, setpts=PTS-STARTPTS[T1]" -y out.avi ++ffmpeg -i in.avi -s 240x320 -vf "[in]setpts=PTS-STARTPTS, [T1]overlay=16:16[out]; movie=3200000:avi:in.avi, scale=180:144, setpts=PTS-STARTPTS[T1]" -y out.avi +@end example + @section nullsrc

1 0

[soc]: r5852 - mms/add_guid.patch
by spyfeng 08 Jul '10

08 Jul '10

Author: spyfeng Date: Thu Jul 8 18:10:38 2010 New Revision: 5852 Log: add asf_stream_bitrate_properties guid. Added: mms/add_guid.patch Added: mms/add_guid.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ mms/add_guid.patch Thu Jul 8 18:10:38 2010 (r5852) @@ -0,0 +1,27 @@ +Index: libavformat/asf.c +=================================================================== +--- libavformat/asf.c (revision 24076) ++++ libavformat/asf.c (working copy) +@@ -110,6 +110,10 @@ + 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 + }; + ++const ff_asf_guid ff_asf_stream_bitrate_properties = { ++ 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 ++}; ++ + /* I am not a number !!! This GUID is the one found on the PC used to + generate the stream */ + const ff_asf_guid ff_asf_my_guid = { +Index: libavformat/asf.h +=================================================================== +--- libavformat/asf.h (revision 24076) ++++ libavformat/asf.h (working copy) +@@ -164,6 +164,7 @@ + extern const ff_asf_guid ff_asf_content_encryption; + extern const ff_asf_guid ff_asf_ext_content_encryption; + extern const ff_asf_guid ff_asf_digital_signature; ++extern const ff_asf_guid ff_asf_stream_bitrate_properties; + + extern const AVMetadataConv ff_asf_metadata_conv[]; +

1 0

[soc]: r5851 - mms/mmst.c
by spyfeng 08 Jul '10

08 Jul '10

Author: spyfeng Date: Thu Jul 8 18:08:56 2010 New Revision: 5851 Log: fix a bug according link: 1)mmst://194.116.83.15/70s 2)mmst://61.139.126.90/mtv (not stable, sometimes failed.) Because the server sends back header in multiple packets with incoming flag 0x04. further we need parser the asf_stream_bitrate_properties guid. Modified: mms/mmst.c Modified: mms/mmst.c ============================================================================== --- mms/mmst.c Thu Jul 8 16:57:11 2010 (r5850) +++ mms/mmst.c Thu Jul 8 18:08:56 2010 (r5851) @@ -26,9 +26,11 @@ #include "libavcodec/bytestream.h" #include "network.h" #include "asf.h" +#include <unistd.h> #define LOCAL_ADDRESS 0xc0a80081 // FIXME get and use correct local ip address. #define LOCAL_PORT 1037 // as above. +#define RETRY_TIMES 10 /** Client to server packet types. */ typedef enum { CS_PKT_INITIAL = 0x01, @@ -77,6 +79,7 @@ typedef enum { typedef struct { int id; + int rate; }MMSStream; typedef struct { @@ -112,6 +115,7 @@ typedef struct { int asf_header_size; ///< Size of stored ASF header. int header_parsed; ///< The header has been received and parsed. int asf_packet_len; + int asf_header_read_size; /*@}*/ int stream_num; ///< stream numbers. @@ -179,6 +183,13 @@ static void mms_put_utf16(MMSContext *mm mms->write_out_ptr += len; } +static int send_time_test_data(MMSContext *mms) +{ + start_command_packet(mms, CS_PKT_TIMING_DATA_REQUEST); + insert_command_prefixes(mms, 0xf0f0f0f1, 0x0004000b); + return send_command_packet(mms); +} + static int send_protocol_select(MMSContext *mms) { char data_string[256]; @@ -197,6 +208,7 @@ static int send_protocol_select(MMSConte LOCAL_PORT); mms_put_utf16(mms, data_string); + bytestream_put_le16(&mms->write_out_ptr, 0); return send_command_packet(mms); } @@ -279,8 +291,6 @@ static MMSSCPacketType get_tcp_server_re int packet_id_type; int tmp; - assert(mms->remaining_in_len==0); - // note we cache the first 8 bytes, // then fill up the buffer with the others tmp = AV_RL16(mms->in_buffer + 6); @@ -321,6 +331,8 @@ static MMSSCPacketType get_tcp_server_re mms->remaining_in_len); mms->asf_header_size += mms->remaining_in_len; } + if (mms->incoming_flags == 0x04) + continue; } else if(packet_id_type == mms->packet_id) { packet_type = SC_PKT_ASF_MEDIA; } else { @@ -358,6 +370,7 @@ static int mms_safe_send_recv(MMSContext const MMSSCPacketType expect_type) { MMSSCPacketType type; + int i; if(send_fun) { int ret = send_fun(mms); if (ret < 0) { @@ -365,13 +378,16 @@ static int mms_safe_send_recv(MMSContext return ret; } } - + for (i = 0; i < RETRY_TIMES; i++) { if ((type = get_tcp_server_response(mms)) != expect_type) { dprintf(NULL,"Unexpected packet type %d with type %d\n", type, expect_type); - return -1; + //return -1; + usleep(50000); } else { return 0; } + } + return -1; } static int send_media_header_request(MMSContext *mms) @@ -417,22 +433,21 @@ static int asf_header_parser(MMSContext { uint8_t *p = mms->asf_header; uint8_t *end; - int flags, stream_id, real_header_size; + int flags, stream_id, is_stream_num_known = 0; mms->stream_num = 0; if (mms->asf_header_size < sizeof(ff_asf_guid) * 2 + 22 || memcmp(p, ff_asf_header, sizeof(ff_asf_guid))) return -1; - real_header_size = AV_RL64(p + sizeof(ff_asf_guid)); - end = mms->asf_header + real_header_size; + end = mms->asf_header + mms->asf_header_size; p += sizeof(ff_asf_guid) + 14; while(end - p >= sizeof(ff_asf_guid) + 8) { uint64_t chunksize = AV_RL64(p + sizeof(ff_asf_guid)); if (!chunksize || chunksize > end - p) { - dprintf(NULL, "chunksize is exceptional value:%d!\n", chunksize); - return -1; + dprintf(NULL, "chunksize is exceptional value:%"PRId64"!\n", chunksize); + return 0; } if (!memcmp(p, ff_asf_file_header, sizeof(ff_asf_guid))) { /* read packet size */ @@ -453,11 +468,38 @@ static int asf_header_parser(MMSContext if (mms->stream_num < MAX_STREAMS && 46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) { mms->streams[mms->stream_num].id = stream_id; - mms->stream_num++; + if (!is_stream_num_known) + mms->stream_num++; } else { - dprintf(NULL,"Too many streams.\n"); + dprintf(NULL, "Too many streams.\n"); return -1; } + } else if (!memcmp(p, ff_asf_head1_guid, sizeof(ff_asf_guid))) { + chunksize = 46; + } else if (!memcmp(p, ff_asf_stream_bitrate_properties, sizeof(ff_asf_guid))) { + int record_cnt = AV_RL16(p + sizeof(ff_asf_guid) + 8); + uint8_t *pos; + if (record_cnt*6 + 16 + 8 + 2 > chunksize) { + dprintf(NULL, "Too many stream record count.\n"); + return -1; + } + if (mms->stream_num < MAX_STREAMS && + 46 + mms->stream_num * 6 < sizeof(mms->out_buffer)) { + mms->stream_num = record_cnt; + is_stream_num_known = 1; + } else { + dprintf(NULL, "Too many streams(bitrate properties)\n"); + return -1; + } + pos = p + 24 + 2; + while(record_cnt > 0) { + flags = AV_RL16(pos); + pos += 2; + stream_id = flags & 0x7F; + mms->streams[stream_id].rate = AV_RL32(pos); + pos += 4; + record_cnt--; + } } p += chunksize; } @@ -497,20 +539,20 @@ static int read_data(MMSContext *mms, ui /** Read at most one media packet (or a whole header). */ static int read_mms_packet(MMSContext *mms, uint8_t *buf, int buf_size) { - int result = 0, read_header_size = 0; + int result = 0; int size_to_copy; do { - if(read_header_size < mms->asf_header_size && !mms->is_playing) { + if(mms->asf_header_read_size < mms->asf_header_size && !mms->is_playing) { /* Read from ASF header buffer */ size_to_copy= FFMIN(buf_size, - mms->asf_header_size - read_header_size); - memcpy(buf, mms->asf_header + read_header_size, size_to_copy); - read_header_size += size_to_copy; + mms->asf_header_size - mms->asf_header_read_size); + memcpy(buf, mms->asf_header + mms->asf_header_read_size, size_to_copy); + mms->asf_header_read_size += size_to_copy; result += size_to_copy; dprintf(NULL, "Copied %d bytes from stored header. left: %d\n", - size_to_copy, mms->asf_header_size - read_header_size); - if (mms->asf_header_size == read_header_size) { + size_to_copy, mms->asf_header_size - mms->asf_header_read_size); + if (mms->asf_header_size == mms->asf_header_read_size) { av_freep(&mms->asf_header); mms->is_playing = 1; } @@ -581,7 +623,7 @@ static int mms_open(URLContext *h, const return AVERROR(ENOMEM); // only for MMS over TCP, so set proto = NULL - ff_url_split(NULL, 0, NULL, 0, + av_url_split(NULL, 0, NULL, 0, mms->host, sizeof(mms->host), &port, mms->path, sizeof(mms->path), uri); @@ -599,6 +641,9 @@ static int mms_open(URLContext *h, const err = mms_safe_send_recv(mms, send_startup_packet, SC_PKT_CLIENT_ACCEPTED); if (err) goto fail; + err = mms_safe_send_recv(mms, send_time_test_data, SC_PKT_TIMING_TEST_REPLY); + if (err) + goto fail; err = mms_safe_send_recv(mms, send_protocol_select, SC_PKT_PROTOCOL_ACCEPTED); if (err) goto fail;

1 0

[soc] G.723.1 Decoder 2420742873e9364b717e9cf298a7fb149c512b92
by naufal11＠gmail.com 08 Jul '10

08 Jul '10

- Log ----------------------------------------------------------------- commit 2420742873e9364b717e9cf298a7fb149c512b92 Author: Naufal <naufal11(a)gmail.com> Date: Thu Jul 8 20:35:26 2010 +0530 Add error handling code diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index df861f4..40836c3 100755 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -15,7 +15,9 @@ typedef struct g723_1_context { FrameType past_frame_type; Rate cur_rate; + int16_t random_seed; int16_t interp_index; + int16_t interp_gain; int16_t sid_gain; int16_t cur_gain; } G723_1_Context; @@ -153,6 +155,12 @@ static inline int16_t abs_16(int16_t x) return (v & INT16_MIN) ? INT16_MAX : v; } +static inline int16_t prand(int16_t *rseed) +{ + *rseed = *rseed * 521 + 259; + return *rseed; +} + static inline int dot_product(const int16_t *v1, const int16_t *v2, int length) { int i, sum = 0; @@ -647,6 +655,34 @@ static int16_t comp_interp_index(int16_t *buf, int16_t pitch_lag, return 0; } +/* + * Peform residual interpolation based on frame classification. + * + * @param buf decoded excitation vector + * @prarm out output vector + * @param lag decoded pitch lag + * @param gain interpolated gain + * @param rseed seed for random number generator + */ +static void residual_interp(int16_t *buf, int16_t *out, int16_t lag, + int16_t gain, int16_t *rseed) +{ + int i; + if (lag) { // Voiced + int16_t *vector_ptr = buf + PITCH_MAX; + // Attenuate + for (i = 0; i < lag; i++) + vector_ptr[i - lag] = vector_ptr[i - lag] * 0x6000 >> 15; + for (i = 0; i < FRAME_LEN; i++) + vector_ptr[i] = vector_ptr[i - lag]; + memcpy(out, vector_ptr, FRAME_LEN * sizeof(int16_t)); + } else { // Unvoiced + for (i = 0; i < FRAME_LEN; i++) + out[i] = gain * prand(rseed) >> 15; + memset(buf, 0, (FRAME_LEN + PITCH_MAX) * sizeof(int16_t)); + } +} + static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { @@ -661,7 +697,6 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int16_t excitation[FRAME_LEN + PITCH_MAX]; int16_t acb_vector[SUBFRAME_LEN]; int16_t *vector_ptr; - int16_t interp_gain; int bad_frame = 0, erased_frames = 0, i, j; if (!buf_size || buf_size < frame_size[buf[0] & 3]) { @@ -689,7 +724,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, vector_ptr = excitation + PITCH_MAX; if (!erased_frames) { // Update interpolation gain memory - interp_gain = fixed_cb_gain[(p->subframe[2].amp_index + + p->interp_gain = fixed_cb_gain[(p->subframe[2].amp_index + p->subframe[3].amp_index) >> 1]; for (i = 0; i < SUBFRAMES; i++) { gen_fcb_excitation(vector_ptr, p->subframe[i], p->cur_rate, @@ -726,6 +761,17 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, vector_ptr + i + ppf[j].index, ppf[j].sc_gain, ppf[j].opt_gain, 1 << 14, 15, SUBFRAME_LEN); + } else { + p->interp_gain = (p->interp_gain * 3 + 2) >> 2; + if (erased_frames == 3) { + // Mute output + memset(excitation, 0, (FRAME_LEN + PITCH_MAX) * sizeof(int16_t)); + memset(out, 0, FRAME_LEN * sizeof(int16_t)); + } else { + // Regenerate frame + residual_interp(excitation, out, p->interp_index, + p->interp_gain, &p->random_seed); + } } } commit 7662f5e1379373f827dcf623f2d39a1e53d25d99 Author: Naufal <naufal11(a)gmail.com> Date: Thu Jul 8 15:54:04 2010 +0530 Compute residual interpolation index diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 435d668..df861f4 100755 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -14,6 +14,10 @@ typedef struct g723_1_context { FrameType cur_frame_type; FrameType past_frame_type; Rate cur_rate; + + int16_t interp_index; + int16_t sid_gain; + int16_t cur_gain; } G723_1_Context; static av_cold int g723_1_decode_init(AVCodecContext *avctx) @@ -595,6 +599,54 @@ static void comp_ppf_coeff(int16_t *buf, int16_t pitch_lag, PPFParam *ppf, } } +/* + * Classify frames as voiced/unvoiced. + * + * @param buf decoded excitation vector + * @param exc_eng excitation energy estimation + * @param scale scaling factor of exc_eng + * + * @return residual interpolation index if voiced, 0 otherwise + */ +static int16_t comp_interp_index(int16_t *buf, int16_t pitch_lag, + int16_t *exc_eng, int16_t *scale) +{ + int16_t index; + int16_t *vector_ptr; + int ccr, tgt_eng, best_eng; + int temp; + + *scale = scale_vector(buf, FRAME_LEN + PITCH_MAX); + + pitch_lag = FFMIN(PITCH_MAX - 3, pitch_lag); + vector_ptr = buf + PITCH_MAX + 2 * SUBFRAME_LEN; + index = pitch_lag; + + // Compute maximum backward cross-correlation + ccr = 0; + index = get_ppf_lag(vector_ptr, &ccr, pitch_lag, SUBFRAME_LEN * 2, -1); + ccr = av_clipl_int32((int64_t)ccr + (1 << 15)) >> 16; + + // Compute target energy + tgt_eng = dot_product(vector_ptr, vector_ptr, SUBFRAME_LEN * 2); + *exc_eng = av_clipl_int32(tgt_eng + (1 << 15)) >> 16; + + if (ccr <= 0) + return 0; + + // Compute best energy + best_eng = dot_product(vector_ptr - index, vector_ptr - index, + SUBFRAME_LEN * 2); + best_eng = av_clipl_int32((int64_t)best_eng + (1 << 15)) >> 16; + + temp = best_eng * tgt_eng >> 3; + + if (temp < ccr * ccr) + return index; + else + return 0; +} + static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { @@ -655,6 +707,9 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, // Save the excitation memcpy(out, excitation + PITCH_MAX, FRAME_LEN); + p->interp_index = comp_interp_index(excitation, p->pitch_lag[1], + &p->sid_gain, &p->cur_gain); + vector_ptr = excitation + PITCH_MAX; for (i = 0, j = 0; i < FRAME_LEN; i += SUBFRAME_LEN, j++) ----------------------------------------------------------------------- Summary of changes: libavcodec/g723_1.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 2 deletions(-) -- http://github.com/naufal/ffmpeg-soc

1 0

[soc]: r5850 - seek2010/seek2010_07_08_r24108.patch
by mchinen 08 Jul '10

08 Jul '10

Author: mchinen Date: Thu Jul 8 16:57:11 2010 New Revision: 5850 Log: add detect cbr function to seek table. Added: seek2010/seek2010_07_08_r24108.patch Added: seek2010/seek2010_07_08_r24108.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ seek2010/seek2010_07_08_r24108.patch Thu Jul 8 16:57:11 2010 (r5850) @@ -0,0 +1,641 @@ +Index: ffplay.c +=================================================================== +--- ffplay.c (revision 24108) ++++ ffplay.c (working copy) +@@ -2392,6 +2392,7 @@ + AVFormatParameters params, *ap = &params; + int eof=0; + int pkt_in_play_range = 0; ++ char *index_filename = NULL; + + ic = avformat_alloc_context(); + +@@ -2508,6 +2509,18 @@ + goto fail; + } + ++ if(ic->filename){ ++ index_filename = av_malloc(strlen(ic->filename) + 5); ++ strcpy(index_filename, ic->filename); ++ strcat(index_filename, ".fdx"); ++ } ++ ++ if (av_load_index_file(ic, index_filename) < 0 ) { ++ av_build_index(ic, 0); //AV_BUILD_INDEX_PARALLEL); ++ av_save_index_file(ic, index_filename); ++ } ++ av_free(index_filename); ++ + for(;;) { + if (is->abort_request) + break; +Index: libavformat/avformat.h +=================================================================== +--- libavformat/avformat.h (revision 24108) ++++ libavformat/avformat.h (working copy) +@@ -535,6 +535,16 @@ + * Number of frames that have been demuxed during av_find_stream_info() + */ + int codec_info_nb_frames; ++ ++ /* new av_seek_frame_table() support */ ++#define AV_SEEKTABLE_BUILDING 0x0001 ///< a flag set by av_build_index to mark that the index is being built ++#define AV_SEEKTABLE_CBR 0x0002 ///< a flag set by av_build_index to note that the file is constant bit rate ++#define AV_SEEKTABLE_FINISHED 0x0004 ///< a flag set by av_build_index to note that the complete index table is ready to use ++#define AV_SEEKTABLE_COPIED 0x0008 ///< a flag to note that the seek table has been copied. ++ int seek_table_flags; ++ AVIndexEntry* parallel_index_entries; ///used with AV_BUILD_INDEX_PARALLEL. should not be touched by client ++ int parallel_nb_index_entries; ++ unsigned int parallel_index_entries_allocated_size; + } AVStream; + + #define AV_PROGRAM_RUNNING 1 +@@ -1133,6 +1143,36 @@ + int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags); + + /** ++ * Gets the index for a specific timestamp using the table. ++ * @param flags if AVSEEK_FLAG_BACKWARD then the returned index will correspond ++ * to the timestamp which is <= the requested one, if backward ++ * is 0, then it will be >= ++ * if AVSEEK_FLAG_ANY seek to any frame, only keyframes otherwise ++ * @return < 0 if no such timestamp could be found ++ */ ++int av_table_search_timestamp(AVStream *st, int64_t wanted_timestamp, int flags); ++ ++/** ++ * Builds a complete index for seeking in each stream where it is possible. ++ * Requires that the streams have been opened. ++ * Part of the new seeking api. incomplete. ++ */ ++int av_build_index(AVFormatContext *s, int flags); ++#define AV_BUILD_INDEX_PARALLEL 0x0001 ///< Builds the index via a copied demuxer streams. av_build_index with this flag can be called on a seperate thread while decoding is happening on another. ++ ++/** ++ * Saves the index table built with av_build_index to a file ++ * Returns 0 if succesful or a negative value on failure. ++ */ ++int av_save_index_file(AVFormatContext *ic, const char *filename); ++ ++/** ++ * Loads the index saved with av_save_index. ++ * Returns 0 if successful or a negative value on failure. ++ */ ++int av_load_index_file(AVFormatContext *ic, const char *filename); ++ ++/** + * Ensure the index uses less memory than the maximum specified in + * AVFormatContext.max_index_size by discarding entries if it grows + * too large. +@@ -1151,6 +1191,15 @@ + int size, int distance, int flags); + + /** ++ * Perform a dictionary search on the seek table. ++ * av_build_index must be successfully called before using this function. ++ * @param timestamp target timestamp in the time base of the given stream ++ * @param stream_index stream number ++ */ ++int av_seek_frame_table(AVFormatContext *s, ++ int stream_index, int64_t timestamp, int flags); ++ ++/** + * Perform a binary search using av_index_search_timestamp() and + * AVCodec.read_timestamp(). + * This is not supposed to be called directly by a user application, +Index: libavformat/utils.c +=================================================================== +--- libavformat/utils.c (revision 24108) ++++ libavformat/utils.c (working copy) +@@ -1031,7 +1031,6 @@ + pkt->convergence_duration = pc->convergence_duration; + } + +- + static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt) + { + AVStream *st; +@@ -1355,21 +1354,28 @@ + + st->index_entries= entries; + +- index= av_index_search_timestamp(st, timestamp, AVSEEK_FLAG_ANY); ++ //if we are building the table, the indicies added in order, so we don't have to do expensive searching. ++ if(st->seek_table_flags & AV_SEEKTABLE_BUILDING) { ++ index = st->nb_index_entries++; ++ ie = &st->index_entries[index]; ++ } ++ else { ++ index= av_index_search_timestamp(st, timestamp, AVSEEK_FLAG_ANY); + +- if(index<0){ +- index= st->nb_index_entries++; +- ie= &entries[index]; +- assert(index==0 || ie[-1].timestamp < timestamp); +- }else{ +- ie= &entries[index]; +- if(ie->timestamp != timestamp){ +- if(ie->timestamp <= timestamp) +- return -1; +- memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(st->nb_index_entries - index)); +- st->nb_index_entries++; +- }else if(ie->pos == pos && distance < ie->min_distance) //do not reduce the distance +- distance= ie->min_distance; ++ if(index<0){ ++ index= st->nb_index_entries++; ++ ie= &entries[index]; ++ assert(index==0 || ie[-1].timestamp < timestamp); ++ }else{ ++ ie= &entries[index]; ++ if(ie->timestamp != timestamp){ ++ if(ie->timestamp <= timestamp) ++ return -1; ++ memmove(entries + index + 1, entries + index, sizeof(AVIndexEntry)*(st->nb_index_entries - index)); ++ st->nb_index_entries++; ++ }else if(ie->pos == pos && distance < ie->min_distance) //do not reduce the distance ++ distance= ie->min_distance; ++ } + } + + ie->pos = pos; +@@ -1705,6 +1711,11 @@ + timestamp = av_rescale(timestamp, st->time_base.den, AV_TIME_BASE * (int64_t)st->time_base.num); + } + ++ /* if we've built a seek table, use it. */ ++ st = s->streams[stream_index]; ++ if (st->seek_table_flags & AV_SEEKTABLE_FINISHED) ++ return av_seek_frame_table(s, stream_index, timestamp, flags); ++ + /* first, we try the format specific seek */ + if (s->iformat->read_seek) + ret = s->iformat->read_seek(s, stream_index, timestamp, flags); +@@ -1742,6 +1753,388 @@ + // try some generic seek like av_seek_frame_generic() but with new ts semantics + } + ++int av_seek_frame_table(AVFormatContext *s, ++ int stream_index, int64_t timestamp, int flags) ++{ ++ int index; ++ int64_t ret; ++ AVStream *st; ++ AVIndexEntry *ie; ++ ++ st = s->streams[stream_index]; ++ ++ //TODO: see if we can do something with the CBR field. ++ if(st->seek_table_flags & AV_SEEKTABLE_CBR){ ++ ; ++ } ++ ++ //see if we need to move the parallel table over ++ if(st->parallel_index_entries) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: copying over parallel frames\n"); ++ av_free(st->index_entries); ++ st->index_entries = st->parallel_index_entries; ++ st->nb_index_entries = st->parallel_nb_index_entries; ++ st->index_entries_allocated_size = st->parallel_index_entries_allocated_size; ++ st->parallel_index_entries = NULL; ++ } ++ ++ index = av_index_search_timestamp(st, timestamp, flags); ++ ++ /* this function should only be called after the table is complete. */ ++ if(index < 0 || index >= st->nb_index_entries-1){ ++ return -1; ++ } ++ ++ ff_read_frame_flush(s); ++ /* we use the native seek function if it exists, (still have to modify them to use seek_table) */ ++ if (s->iformat->read_seek){ ++ if(s->iformat->read_seek(s, stream_index, timestamp, flags) >= 0) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: table seeked using native function\n"); ++ return 0; ++ } ++ } ++ ++ ie = &st->index_entries[index]; ++ if ((ret = url_fseek(s->pb, ie->pos, SEEK_SET)) < 0) ++ return ret; ++ av_update_cur_dts(s, st, ie->timestamp); ++ ++ { ++ float request_time = (((float)timestamp/st->time_base.den)*st->time_base.num); ++ float actual_time = (((float)ie->timestamp/st->time_base.den)*st->time_base.num); ++ float time_base_inv = ((float)st->time_base.den/st->time_base.num); ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: table seeked to %.2fs (actual request was %.2fs), timebaseinv %f, samplerate of %d\n",actual_time, request_time, time_base_inv, st->codec->sample_rate ); ++ } ++ return 0; ++} ++ ++//if we don't have the number of frames, we just guess. ++#define AV_DETECT_CBR_FPS_GUESS 10 ++static int av_detect_cbr(AVFormatContext *s, AVStream *st) { ++ //check the stream's codec to see if a number of frames are listed, but we can't assume that is available. ++ if(s->data_offset > 0 && s->file_size > 0 && st->codec && st->duration > 0) { ++ double sec_duration = st->duration * av_q2d(st->time_base); ++ int nb_frames = st->nb_frames?st->nb_frames:(sec_duration*AV_DETECT_CBR_FPS_GUESS); ++ int64_t br_dur_len = (st->codec->bit_rate * sec_duration)/8; ++ int64_t min_len = (s->file_size - s->data_offset) * (1 - 2.0/nb_frames); ++ int64_t max_len = (s->file_size - s->data_offset) * (1 + 2.0/nb_frames); ++ ++ if(min_len < br_dur_len && br_dur_len < max_len) { ++ av_log(s, AV_LOG_DEBUG, "cbr ok (%lli < %lli < %lli) with bitrate=%i, timebase=%i/%i, duration = %f(%lli), nb_frames = %lli, offset= %lli\n", ++ min_len, br_dur_len, max_len, st->codec->bit_rate,st->time_base.num,st->time_base.den, st->duration*av_q2d(st->time_base),st->duration,st->nb_frames,s->data_offset); ++ return 1; ++ } ++ av_log(s, AV_LOG_DEBUG, "cbr failed !(%lli < %lli < %lli) with bitrate=%i, timebase=%i/%i, duration = %f(%lli), nb_frames = %lli, offset= %lli\n", ++ min_len, br_dur_len, max_len, st->codec->bit_rate,st->time_base.num,st->time_base.den, st->duration*av_q2d(st->time_base),st->duration,st->nb_frames,s->data_offset); ++ }else { ++ av_log(s, AV_LOG_DEBUG, "no cbr test with bitrate=%i, timebase=%i/%i, duration = %f(%lli), nb_frames = %lli, offset= %lli\n", ++ st->codec?st->codec->bit_rate:-1,st->time_base.num,st->time_base.den, st->duration*av_q2d(st->time_base),st->duration,st->nb_frames,s->data_offset); ++ } ++ ++ return 0; ++} ++ ++/** ++ * Starts building a index for seeking. ++ * TODO: use a different file pointer so we can do this in a thread-safe manner, ++ * as there are cases when the user will want to playback while building the index ++ **/ ++int av_build_index(AVFormatContext *s, int flags) ++{ ++ AVStream *st; ++ int ret; ++ int stream_index; ++ int i; ++ int orig_flags; ++ ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: starting building index\n"); ++ stream_index = av_find_default_stream_index(s); ++ if(stream_index < 0) ++ return -1; ++ ++ st = s->streams[stream_index]; ++ /* TODO: check if this stream is CBR and the codec has a seek by timestamp. */ ++ /* if this is true then we can set a flag and exit here. */ ++ if(av_detect_cbr(s,st)) { ++ st->seek_table_flags |= AV_SEEKTABLE_CBR; ++ } else if(0) { ++ /* TODO: for this case see if we have a special method for generating the table */ ++ /* specific to a given format. */ ++ } else if(st->nb_frames!=0 && st->nb_index_entries > st->nb_frames/2) { ++ /* some demuxers load a complete index upon file open. */ ++ st->seek_table_flags |= AV_SEEKTABLE_COPIED; ++ } else { ++ AVFormatContext *build_ic; ++ AVPacket pkt; ++ ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: building index from scratch\n"); ++ ++ /* if the client needs it to be threadsafe, create a new format context to read from. */ ++ if(flags & AV_BUILD_INDEX_PARALLEL) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: making thread-safe copy of streams\n"); ++ build_ic = avformat_alloc_context(); ++ ret = av_open_input_file(&build_ic, s->filename, s->iformat, 0, NULL); ++ ++ if(ret < 0) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: error re-opening file/streams: %i\n", ret); ++ goto cleanup; ++ } ++ if(build_ic->nb_streams != s->nb_streams) { ++ ret = -1; ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: cloned AVFormatContext has different number of streams!"); ++ goto cleanup; ++ } ++ ++ for(i = 0; i < build_ic->nb_streams; i++) { ++ AVStream *build_st= build_ic->streams[i]; ++ AVCodecContext *avctx = build_st->codec; ++ AVCodec *pcodec; ++ build_ic->streams[i]->discard = AVDISCARD_DEFAULT; ++ ++ //compare with the orignal stream's context, and if opened, copy settings and open the clone ++ if(s->streams[i]->codec->priv_data) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: copying stream based on priv_data\n"); ++ if((ret = avcodec_copy_context(avctx, s->streams[i]->codec)) < 0) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: error copying codec:%i\n", ret); ++ goto cleanup; ++ } ++ pcodec = avcodec_find_decoder(avctx->codec_id); ++ if((ret = avcodec_open(avctx,pcodec)) < 0) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: error opening codec:%i\n", ret); ++ goto cleanup; ++ } ++ } ++ } ++ } else { ++ build_ic = s; ++ } ++ ++ /* default table generation behavior from av_seek_frame_generic */ ++ /* TODO: see why s->data_offset is the file length for avi/mp4 and others */ ++ if ((ret = url_fseek(build_ic->pb, 0/*s->data_offset*/, SEEK_SET)) < 0){ ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: error building index: %i\n", ret); ++ goto cleanup; ++ } ++ ++ orig_flags = build_ic->flags; ++ build_ic->flags |= AVFMT_FLAG_GENPTS; ++ for(i=0;; i++) { ++ do{ ++ ret = av_read_frame(build_ic, &pkt); ++ }while(ret == AVERROR(EAGAIN)); ++ if(ret<0) ++ break; ++ av_free_packet(&pkt); ++ } ++ build_ic->flags = orig_flags; ++ ret = 0; ++ cleanup: ++ if(flags & AV_BUILD_INDEX_PARALLEL) { ++ //TODO: delay/wait till the main index signals us that we are okay to swap ++ if(build_ic) { ++ //take the index over from our clone ++ for(i = 0; i < build_ic->nb_streams; i++) { ++ if(ret >= 0) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: marking %i frames from parallel stream ready for copy\n", build_ic->streams[i]->nb_index_entries); ++ s->streams[i]->parallel_index_entries = build_ic->streams[i]->index_entries; ++ s->streams[i]->parallel_nb_index_entries = build_ic->streams[i]->nb_index_entries; ++ s->streams[i]->parallel_index_entries_allocated_size = build_ic->streams[i]->index_entries_allocated_size; ++ build_ic->streams[i]->index_entries = NULL; ++ s->streams[i]->seek_table_flags |= AV_SEEKTABLE_FINISHED; ++ } ++ avcodec_close(build_ic->streams[i]->codec); ++ } ++ av_close_input_file(build_ic); ++ } ++ } ++ if(ret < 0) ++ return ret; ++ } ++ ++ /* since we may have moved the read cursor to the end, return seek to start of stream for non-parallel clients. Not sure if this the desired behavior. */ ++ if( !(flags & AV_BUILD_INDEX_PARALLEL) && !(st->seek_table_flags & AV_SEEKTABLE_COPIED) ) { ++ ff_read_frame_flush(s); ++ for(i=0; i<s->nb_streams;i++) ++ if(s->streams[i]->nb_index_entries) ++ s->streams[i]->seek_table_flags |= AV_SEEKTABLE_FINISHED; ++ if( (ret = av_seek_frame(s, stream_index, st->start_time, 0) ) < 0 ) { ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: finished building index but error seeking: %i,trying url_fseek\n", ret); ++ /* last ditch effort to seek using the file pointer. */ ++ if ((ret = url_fseek(s->pb, 0, SEEK_SET)) < 0) { ++ av_log(s,AV_LOG_DEBUG,"SEEK_TABLE_DEBUG: error seeking with url_fseek: %i\n", ret); ++ return ret; ++ } ++ } ++ } ++ av_log(s, AV_LOG_DEBUG, "SEEK_TABLE_DEBUG: finished building index\n"); ++ return 0; ++} ++ ++/** ++ * Save the flags, size, and differences for the index table ++ */ ++#define AV_SAVEINDEX_PACKETSIZE 1000 ++static int av_save_index_stream(ByteIOContext *bc, AVStream *st) { ++ AVIndexEntry start_ie; ++ AVIndexEntry *last_ie, *curr_ie; ++ int i; ++ ++ //we may need to save something like codec id to be safe. ++ put_v(bc, st->seek_table_flags); ++ //we only write the index if we have a finished table. ++ if(st->seek_table_flags & AV_SEEKTABLE_FINISHED) { ++ put_v(bc, st->nb_index_entries); ++ ++ memset(&start_ie, 0, sizeof(AVIndexEntry)); ++ last_ie = &start_ie; ++ for(i = 0; i < st->nb_index_entries; i++) { ++ curr_ie = &st->index_entries[i]; ++ put_v(bc, curr_ie->pos - last_ie->pos); ++ put_v(bc, curr_ie->timestamp - last_ie->timestamp); ++ put_v(bc, curr_ie->flags - last_ie->pos); ++ put_v(bc, curr_ie->size - last_ie->size); ++ put_v(bc, curr_ie->min_distance - last_ie->min_distance); ++ last_ie = curr_ie; ++ if(i % AV_SAVEINDEX_PACKETSIZE == 0) ++ put_flush_packet(bc); ++ } ++ av_log(NULL, AV_LOG_DEBUG, "successfully wrote index stream with %i entries.\n", st->nb_index_entries); ++ } ++ put_flush_packet(bc); ++ ++ return 0; ++} ++ ++/** ++ * load the flags, size, and differences for the index table ++ */ ++static int av_load_index_stream(ByteIOContext *bc, AVStream *st) { ++ AVIndexEntry *ie, *last_ie; ++ uint64_t v; ++ ++ //check to see if we have a table saved in this stream. ++ v = ff_get_v(bc); ++ if(v & AV_SEEKTABLE_FINISHED) { ++ st->seek_table_flags = v; ++ st->nb_index_entries = v = ff_get_v(bc); ++ ++ //dump the old index and make the new one. ++ av_free(st->index_entries); ++ st->index_entries = av_malloc(v * sizeof(AVIndexEntry)); ++ ++ //the first index entry is not a diff, so it gets special treatment. ++ ie = st->index_entries; ++ if(v--) { ++ ie->pos = ff_get_v(bc); ++ ie->timestamp = ff_get_v(bc); ++ ie->flags = ff_get_v(bc); ++ ie->size = ff_get_v(bc); ++ ie->min_distance = ff_get_v(bc); ++ last_ie = ie; ++ ie++; ++ } ++ ++ while(v--) { ++ ie->pos = ff_get_v(bc) + last_ie->pos; ++ ie->timestamp = ff_get_v(bc) + last_ie->timestamp; ++ ie->flags = ff_get_v(bc) + last_ie->flags; ++ ie->size = ff_get_v(bc) + last_ie->size; ++ ie->min_distance = ff_get_v(bc) + last_ie->min_distance; ++ last_ie = ie; ++ ie++; ++ } ++ av_log(NULL, AV_LOG_DEBUG, "successfully loaded index stream with %i entries.\n", st->nb_index_entries); ++ } ++ return 0; ++} ++ ++/** ++ * Saves the table index built with av_build_index to a file. ++ * Returns 0 if successful, or a negative number if not. ++ * this is not mean to be human-readable ++ * we save the following things in order: ++ * - A strz "FFmpegTableIndex" (17 bytes) ++ * - The libavformat version number ++ * - The file name (null terminated) ++ * - the number of streams (4 bytes) ++ * - each of the streams' index tables via av_save_index_stream ++ */ ++#define AV_INDEX_IDENTIFIER "FFmpegTableIndex" ++#define AV_INDEX_NOFILENAME "nofilename" ++static int av_save_index(ByteIOContext *bc, AVFormatContext *ic) { ++ int i, ret; ++ ++ put_strz(bc, AV_INDEX_IDENTIFIER); ++ put_v(bc, LIBAVFORMAT_VERSION_INT); ++ put_strz(bc, ic->filename?ic->filename:AV_INDEX_NOFILENAME); ++ put_v(bc, ic->nb_streams); ++ for(i = 0; i< ic->nb_streams; i++) { ++ ret = av_save_index_stream(bc, ic->streams[i]); ++ if(ret < 0) ++ return ret; ++ } ++ put_flush_packet(bc); ++ av_log(ic, AV_LOG_DEBUG, "successfully wrote index.\n"); ++ return 0; ++} ++ ++static int av_load_index(ByteIOContext *bc, AVFormatContext *ic) { ++ int i, ret; ++ uint64_t v; ++ char read_str[256]; ++ ++ get_strz(bc, read_str, 255); ++ if( strcmp(read_str, AV_INDEX_IDENTIFIER) ) ++ return -1; ++ //version ++ v = ff_get_v(bc); ++ //make sure the filename matches the context we will write to. ++ get_strz(bc, read_str, 255); ++ if( strlen(read_str) < 255 && strcmp(read_str, ic->filename) && strcmp(read_str, AV_INDEX_NOFILENAME) ) ++ return -1; ++ ++ v = ff_get_v(bc); ++ if( v != ic->nb_streams) ++ return -1; ++ for(i =0; i<v; i++) { ++ ret = av_load_index_stream(bc, ic->streams[i]); ++ if(ret < 0) ++ return ret; ++ } ++ av_log(ic, AV_LOG_DEBUG, "successfully read index.\n"); ++ return 0; ++} ++ ++int av_save_index_file(AVFormatContext *ic, const char* filename) { ++ ByteIOContext* bc; ++ int i, ret, table_completed = 0; ++ ++ //do a first pass to see if we have any tables that need saving. ++ //only write the file if it exists. ++ for(i = 0; i< ic->nb_streams; i++) ++ table_completed |= ic->streams[i]->seek_table_flags & AV_SEEKTABLE_FINISHED; ++ if(!table_completed) ++ return -1; ++ ++ if ((ret=url_fopen(&bc, filename, URL_WRONLY)) < 0) { ++ return -1; ++ } ++ ret = av_save_index(bc, ic); ++ url_fclose(bc); ++ return ret; ++} ++ ++int av_load_index_file(AVFormatContext *ic, const char* filename) { ++ ByteIOContext* bc; ++ int ret; ++ ++ if ((ret=url_fopen(&bc, filename, URL_RDONLY)) < 0) { ++ return -1; ++ } ++ ret = av_load_index(bc, ic); ++ url_fclose(bc); ++ return ret; ++} + /*******************************************************/ + + /** +Index: libavformat/avio.h +=================================================================== +--- libavformat/avio.h (revision 24108) ++++ libavformat/avio.h (working copy) +@@ -348,8 +348,14 @@ + void put_tag(ByteIOContext *s, const char *tag); + + void put_strz(ByteIOContext *s, const char *buf); ++void put_v(ByteIOContext *bc, uint64_t val); + + /** ++ * Get the length in bytes which is needed to store val as v. ++ */ ++int get_length(uint64_t val); ++ ++/** + * fseek() equivalent for ByteIOContext. + * @return new position or AVERROR. + */ +Index: libavformat/nutenc.c +=================================================================== +--- libavformat/nutenc.c (revision 24108) ++++ libavformat/nutenc.c (working copy) +@@ -241,27 +241,6 @@ + nut->frame_code['N'].flags= FLAG_INVALID; + } + +-/** +- * Get the length in bytes which is needed to store val as v. +- */ +-static int get_length(uint64_t val){ +- int i=1; +- +- while(val>>=7) +- i++; +- +- return i; +-} +- +-static void put_v(ByteIOContext *bc, uint64_t val){ +- int i= get_length(val); +- +- while(--i>0) +- put_byte(bc, 128 | (val>>(7*i))); +- +- put_byte(bc, val&127); +-} +- + static void put_tt(NUTContext *nut, StreamContext *nus, ByteIOContext *bc, uint64_t val){ + val *= nut->time_base_count; + val += nus->time_base - nut->time_base; +Index: libavformat/aviobuf.c +=================================================================== +--- libavformat/aviobuf.c (revision 24108) ++++ libavformat/aviobuf.c (working copy) +@@ -284,6 +284,24 @@ + put_byte(s, val); + } + ++int get_length(uint64_t val){ ++ int i=1; ++ ++ while(val>>=7) ++ i++; ++ ++ return i; ++} ++ ++void put_v(ByteIOContext *bc, uint64_t val){ ++ int i= get_length(val); ++ ++ while(--i>0) ++ put_byte(bc, 128 | (val>>(7*i))); ++ ++ put_byte(bc, val&127); ++} ++ + void put_tag(ByteIOContext *s, const char *tag) + { + while (*tag) {

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 08 Jul '10

08 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via 5235ba66ad3c722abe03ed4659a84c54b4e644e3 (commit) from 2983a53df354f9bfbb8234805b23bd16b40c693a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5235ba66ad3c722abe03ed4659a84c54b4e644e3 Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 7 21:07:13 2010 -0300 Mark all temporary comments/notes with tag "XXX: " diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 8422313..632589a 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -25,7 +25,7 @@ #include <stdint.h> #define LP_ORDER 16 ///< linear predictive coding filter order -#define MIN_ISF_SPACING 50.0 /* Taken from fixed-point 26.173, not sure */ +#define MIN_ISF_SPACING 50.0 /* XXX: Taken from fixed-point 26.173, not sure */ #define PRED_FACTOR (1.0/3.0) #define AMRWB_SUBFRAME_SIZE 64 ///< samples per subframe diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index a93fa9d..932ab9b 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -98,7 +98,7 @@ static enum Mode unpack_bitstream(AMRWBContext *ctx, const uint8_t *buf, /* AMR-WB Auxiliary Information */ ctx->fr_mode_ind = get_bits(&gb, 4); ctx->fr_mode_req = get_bits(&gb, 4); - ///Need to check conformity in mode_ind/mode_req and crc? + //XXX: Need to check conformity in mode_ind/mode_req and crc? ctx->fr_crc = get_bits(&gb, 8); data = (uint16_t *) &ctx->frame; @@ -257,7 +257,7 @@ static void isf_set_min_dist(float *isf, float min_spacing, int size) { static void interpolate_isp(double isp_q[4][LP_ORDER], double *isp4_past) { int i; - /* Did not used ff_weighted_vector_sumf because using double */ + /* XXX: Did not used ff_weighted_vector_sumf because using double */ for (i = 0; i < LP_ORDER; i++) isp_q[0][i] = 0.55 * isp4_past[i] + 0.45 * isp_q[3][i]; @@ -281,7 +281,7 @@ static void isp2lp(double isp[LP_ORDER], float *lp, int lp_half_order) { double pa[MAX_LP_HALF_ORDER+1], qa[MAX_LP_HALF_ORDER+1]; float *lp2 = lp + (lp_half_order << 1); double last_isp = isp[2 * lp_half_order - 1]; - double qa_old = 0; /* qa[i-2] assuming qa[-1] = 0, not mentioned in document */ + double qa_old = 0; /* XXX: qa[i-2] assuming qa[-1] = 0, not mentioned in document */ int i; ff_lsp2polyf(isp, pa, lp_half_order); @@ -332,7 +332,7 @@ static void decode_pitch_lag_high(int *lag_int, int *lag_frac, int pitch_index, *lag_int = (pitch_index + 1) >> 2; *lag_frac = pitch_index - (*lag_int << 2); *lag_int += *base_lag_int - 8; - /* Doesn't seem to need bounding according to TS 26.190 */ + /* XXX: Doesn't seem to need bounding according to TS 26.190 */ } } @@ -432,7 +432,7 @@ static void decode_pitch_vector(AMRWBContext *ctx, * @param code [in] Pulse index (no. of bits varies, see below) * @param m [in] (log2) Number of potential positions */ -//XXX : Some of these functions are simple and recurrent (used inline) +//XXX: Some of these functions are simple and recurrent (used inline) static inline void decode_1p_track(int *out, int code, int m) ///code: m+1 bits { @@ -471,7 +471,7 @@ static void decode_3p_track(int *out, int code, int m) ///code: 3m+1 bits * @param pulse_lo LSBs part of the pulse index array * @param mode mode of the current frame */ -// For now, uses the same AMRFixed struct from AMR-NB but +// XXX: For now, uses the same AMRFixed struct from AMR-NB but // the maximum number of pulses in it was increased to 24 static void decode_fixed_sparse(AMRFixed *fixed_sparse, const uint16_t *pulse_hi, const uint16_t *pulse_lo, const enum Mode mode) @@ -556,8 +556,9 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, for (sub = 0; sub < 4; sub++) { const AMRWBSubFrame *cur_subframe = &cf->subframe[sub]; + /* Decode adaptive codebook */ decode_pitch_vector(ctx, cur_subframe, sub); - + /* Decode innovative codebook */ decode_fixed_sparse(&fixed_sparse, cur_subframe->pul_ih, cur_subframe->pul_il, ctx->fr_cur_mode); } ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdata.h | 2 +- libavcodec/amrwbdec.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 08 Jul '10

08 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via 2983a53df354f9bfbb8234805b23bd16b40c693a (commit) from d29085706f26b6691f8d3a74c07b23cd02cf9785 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2983a53df354f9bfbb8234805b23bd16b40c693a Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 7 20:59:46 2010 -0300 Decode pulse index for modes 6k60 8k85 12k65 14k25 diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h index ba3437f..08ca212 100644 --- a/libavcodec/acelp_vectors.h +++ b/libavcodec/acelp_vectors.h @@ -28,8 +28,8 @@ /** Sparse representation for the algebraic codebook (fixed) vector */ typedef struct { int n; - int x[10]; - float y[10]; + int x[24]; + float y[24]; int no_repeat_mask; int pitch_lag; float pitch_fac; diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 727022e..8422313 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -1637,6 +1637,13 @@ static const float ac_inter[65] = { 0.000098, 0.000048, 0.000007, 0.000000 }; +/* [i][j] is the number of pulses in track j at mode i */ +static const int pulses_nb_per_mode_tr[][4] = { + {1, 1, 0, 0}, {1, 1, 1, 1}, {2, 2, 2, 2}, + {3, 3, 2, 2}, {3, 3, 3, 3}, {4, 4, 4, 4}, + {5, 5, 4, 4}, {6, 6, 6, 6}, {6, 6, 6, 6} +}; + /* Core frame sizes in each mode */ static const uint16_t cf_sizes_wb[] = { 132, 177, 253, 285, 317, 365, 397, 461, 477, diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 8cd0925..a93fa9d 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -23,9 +23,16 @@ #include "get_bits.h" #include "lsp.h" #include "acelp_filters.h" +#include "acelp_vectors.h" #include "amrwbdata.h" +/** Get x bits in the index interval [lsb,lsb+len-1] inclusive */ +#define BIT_STR(x,lsb,len) (((x) >> (lsb)) & ((1 << (len)) - 1)) + +/** Get the bit at specified position */ +#define BIT_POS(x, p) (((x) >> (p)) & 1) + typedef struct { AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream enum Mode fr_cur_mode; ///< mode index of current frame @@ -413,6 +420,101 @@ static void decode_pitch_vector(AMRWBContext *ctx, } } +/** + * The next six functions decode_[i]p_track decode exactly i pulses + * positions and amplitudes (-1 or 1) in a subframe track using + * an encoded pulse indexing (TS 26.190 section 5.8.2). + * + * The results are given in out[], in which a negative number means + * amplitude -1 and vice-versa. (i.e., ampl = x/abs(x) ) + * + * @param out [out] Output buffer (writes i elements) + * @param code [in] Pulse index (no. of bits varies, see below) + * @param m [in] (log2) Number of potential positions + */ +//XXX : Some of these functions are simple and recurrent (used inline) + +static inline void decode_1p_track(int *out, int code, int m) ///code: m+1 bits +{ + int pos = BIT_STR(code, 0, m); + + out[0] = BIT_POS(code, m) ? -pos : pos; +} + +static inline void decode_2p_track(int *out, int code, int m) ///code: 2m+1 bits +{ + int pos0 = BIT_STR(code, m, m); + int pos1 = BIT_STR(code, 0, m); + + out[0] = BIT_POS(code, 2*m) ? -pos0 : pos0; + out[1] = BIT_POS(code, 2*m) ? -pos1 : pos1; + out[1] = pos0 > pos1 ? -out[1] : out[1]; +} + +static void decode_3p_track(int *out, int code, int m) ///code: 3m+1 bits +{ + int half_2p = BIT_POS(code, 2*m-1) << (m-1); + + decode_2p_track(out, BIT_STR(code, 0, 2*m-1), m-1); + // put two decoded pulses (+ or -) in the correct half + out[0] += (out[0] > 0) ? half_2p : -half_2p; + out[1] += (out[1] > 0) ? half_2p : -half_2p; + decode_1p_track(out + 2, BIT_STR(code, 2*m, m+1), m); +} + +/** + * Decode the algebraic codebook index to pulse positions and signs, + * then construct the algebraic codebook vector. + * + * @param fixed_sparse pointer to the algebraic (innovative) codebook + * @param pulse_hi MSBs part of the pulse index array (used in higher modes) + * @param pulse_lo LSBs part of the pulse index array + * @param mode mode of the current frame + */ +// For now, uses the same AMRFixed struct from AMR-NB but +// the maximum number of pulses in it was increased to 24 +static void decode_fixed_sparse(AMRFixed *fixed_sparse, const uint16_t *pulse_hi, + const uint16_t *pulse_lo, const enum Mode mode) +{ + /* sig_pos stores for each track the decoded pulse position + * indexes multiplied by its corresponding amplitude (+1 or -1) */ + int sig_pos[4][6]; + int pulses_nb = 0; + int spacing = (mode == MODE_6k60) ? 2 : 4; + int i, j; + + switch (mode) { + case MODE_6k60: + for (i = 0; i < 2; i++) + decode_1p_track(sig_pos[i], pulse_lo[i], 5); + break; + case MODE_8k85: + for (i = 0; i < 4; i++) + decode_1p_track(sig_pos[i], pulse_lo[i], 4); + break; + case MODE_12k65: + for (i = 0; i < 4; i++) + decode_2p_track(sig_pos[i], pulse_lo[i], 4); + break; + case MODE_14k25: + for (i = 0; i < 2; i++) + decode_3p_track(sig_pos[i], pulse_lo[i], 4); + for (i = 2; i < 4; i++) + decode_2p_track(sig_pos[i], pulse_lo[i], 4); + break; + } + + for (i = 0; i < 4; i++) + for (j = 0; j < pulses_nb_per_mode_tr[mode][i]; j++) { + int pos = sig_pos[i][j]; + fixed_sparse->x[pulses_nb] = FFABS(pos) * spacing + i; + fixed_sparse->y[pulses_nb] = pos < 0 ? -1.0 : 1.0; + pulses_nb++; + } + + fixed_sparse->n = pulses_nb; +} + static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { @@ -420,6 +522,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AMRWBFrame *cf = &ctx->frame; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; + AMRFixed fixed_sparse = {0}; // fixed vector up to anti-sparseness processing int sub; ctx->fr_cur_mode = unpack_bitstream(ctx, buf, buf_size); @@ -454,6 +557,9 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const AMRWBSubFrame *cur_subframe = &cf->subframe[sub]; decode_pitch_vector(ctx, cur_subframe, sub); + + decode_fixed_sparse(&fixed_sparse, cur_subframe->pul_ih, + cur_subframe->pul_il, ctx->fr_cur_mode); } //update state for next frame ----------------------------------------------------------------------- Summary of changes: libavcodec/acelp_vectors.h | 4 +- libavcodec/amrwbdata.h | 7 +++ libavcodec/amrwbdec.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 2 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 07 Jul '10

07 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via d29085706f26b6691f8d3a74c07b23cd02cf9785 (commit) from 4eb7fe39243afcfe69438ad5ec3dc64eda5aed82 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d29085706f26b6691f8d3a74c07b23cd02cf9785 Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 7 12:09:31 2010 -0300 Unify pulse index storage in 18k25 and 19k85 modes diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 6b74e85..727022e 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -52,7 +52,6 @@ typedef struct { uint16_t adap; ///< adaptive codebook index uint8_t ltp; ///< ltp-filtering flag uint8_t vq; ///< VQ gain - uint8_t pul_sel; ///< pulse case selector for tracks (2 bits each) uint8_t gain; ///< codebooks gain uint8_t energy; ///< high-band energy uint16_t pul_ih[4]; ///< MSBs part of codebook index (high modes only) @@ -328,7 +327,10 @@ static const uint16_t order_MODE_18k25[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 8, AMR_OF(0, pul_sel), 123, 116, 145, 114, 134, 117, 126, 132, + 2, AMR_OF(0, pul_ih[0]), 123, 116, + 2, AMR_OF(0, pul_ih[1]), 145, 114, + 2, AMR_OF(0, pul_ih[2]), 134, 117, + 2, AMR_OF(0, pul_ih[3]), 126, 132, 14, AMR_OF(0, pul_il[0]), 166, 262, 336, 192, 182, 296, 203, 170, 175, 259, 274, 308, 341, 135, 14, AMR_OF(0, pul_il[1]), 197, 281, 348, 217, 209, 315, 235, 159, @@ -340,7 +342,10 @@ static const uint16_t order_MODE_18k25[] = { 7, AMR_OF(0, vq), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(1, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(1, ltp), 106, - 8, AMR_OF(1, pul_sel), 140, 111, 128, 113, 119, 120, 139, 138, + 2, AMR_OF(1, pul_ih[0]), 140, 111, + 2, AMR_OF(1, pul_ih[1]), 128, 113, + 2, AMR_OF(1, pul_ih[2]), 119, 120, + 2, AMR_OF(1, pul_ih[3]), 139, 138, 14, AMR_OF(1, pul_il[0]), 180, 275, 339, 230, 216, 326, 236, 185, 177, 264, 305, 316, 359, 122, 14, AMR_OF(1, pul_il[1]), 158, 271, 334, 239, 214, 324, 224, 162, @@ -353,7 +358,10 @@ static const uint16_t order_MODE_18k25[] = { 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(2, ltp), 107, - 8, AMR_OF(2, pul_sel), 151, 127, 154, 124, 150, 141, 131, 157, + 2, AMR_OF(2, pul_ih[0]), 151, 127, + 2, AMR_OF(2, pul_ih[1]), 154, 124, + 2, AMR_OF(2, pul_ih[2]), 150, 141, + 2, AMR_OF(2, pul_ih[3]), 131, 157, 14, AMR_OF(2, pul_il[0]), 246, 312, 362, 251, 250, 332, 249, 225, 219, 256, 282, 317, 363, 155, 14, AMR_OF(2, pul_il[1]), 240, 292, 340, 254, 253, 331, 268, 195, @@ -365,7 +373,10 @@ static const uint16_t order_MODE_18k25[] = { 7, AMR_OF(2, vq), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(3, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(3, ltp), 108, - 8, AMR_OF(3, pul_sel), 136, 121, 142, 125, 146, 110, 130, 143, + 2, AMR_OF(3, pul_ih[0]), 136, 121, + 2, AMR_OF(3, pul_ih[1]), 142, 125, + 2, AMR_OF(3, pul_ih[2]), 146, 110, + 2, AMR_OF(3, pul_ih[3]), 130, 143, 14, AMR_OF(3, pul_il[0]), 165, 280, 342, 243, 226, 325, 221, 179, 189, 257, 277, 295, 344, 149, 14, AMR_OF(3, pul_il[1]), 211, 289, 353, 255, 227, 329, 208, 169, @@ -394,7 +405,8 @@ static const uint16_t order_MODE_19k85[] = { 314, 270, 10, AMR_OF(0, pul_ih[1]), 135, 160, 265, 344, 390, 167, 110, 210, 334, 260, - 4, AMR_OF(0, pul_sel), 124, 148, 132, 136, + 2, AMR_OF(0, pul_ih[2]), 124, 148, + 2, AMR_OF(0, pul_ih[3]), 132, 136, 10, AMR_OF(0, pul_ih[0]), 349, 113, 173, 206, 303, 375, 253, 283, 338, 384, 10, AMR_OF(0, pul_il[1]), 350, 111, 161, 195, 286, 369, 245, 266, @@ -410,7 +422,8 @@ static const uint16_t order_MODE_19k85[] = { 336, 267, 10, AMR_OF(1, pul_ih[1]), 127, 166, 254, 340, 394, 159, 117, 225, 329, 296, - 4, AMR_OF(1, pul_sel), 122, 141, 119, 134, + 2, AMR_OF(1, pul_ih[2]), 122, 141, + 2, AMR_OF(1, pul_ih[3]), 119, 134, 10, AMR_OF(1, pul_ih[0]), 346, 125, 165, 204, 295, 371, 273, 277, 319, 382, 10, AMR_OF(1, pul_il[1]), 354, 121, 162, 209, 301, 365, 251, 259, @@ -427,7 +440,8 @@ static const uint16_t order_MODE_19k85[] = { 333, 281, 10, AMR_OF(2, pul_ih[1]), 153, 178, 291, 353, 395, 183, 130, 236, 332, 275, - 4, AMR_OF(2, pul_sel), 133, 154, 123, 143, + 2, AMR_OF(2, pul_ih[2]), 133, 154, + 2, AMR_OF(2, pul_ih[3]), 123, 143, 10, AMR_OF(2, pul_ih[0]), 357, 126, 197, 241, 325, 380, 279, 278, 331, 393, 10, AMR_OF(2, pul_il[1]), 352, 139, 189, 235, 330, 383, 293, 298, @@ -443,7 +457,8 @@ static const uint16_t order_MODE_19k85[] = { 343, 258, 10, AMR_OF(3, pul_ih[1]), 149, 169, 262, 328, 391, 170, 118, 188, 327, 272, - 4, AMR_OF(3, pul_sel), 120, 144, 112, 142, + 2, AMR_OF(3, pul_ih[2]), 120, 144, + 2, AMR_OF(3, pul_ih[3]), 112, 142, 10, AMR_OF(3, pul_ih[0]), 359, 128, 171, 233, 309, 378, 257, 264, 335, 377, 10, AMR_OF(3, pul_il[1]), 348, 116, 180, 220, 310, 379, 274, 289, ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdata.h | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 07 Jul '10

07 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via 4eb7fe39243afcfe69438ad5ec3dc64eda5aed82 (commit) from 222bb38d248bd57851851fa54e41b749eb1081e0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4eb7fe39243afcfe69438ad5ec3dc64eda5aed82 Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Wed Jul 7 11:57:14 2010 -0300 Rename some subframe variables related to algebraic codebook diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 5e4f62e..6b74e85 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -52,11 +52,11 @@ typedef struct { uint16_t adap; ///< adaptive codebook index uint8_t ltp; ///< ltp-filtering flag uint8_t vq; ///< VQ gain - uint8_t pulse; ///< pulse selector for tracks (2 bits each) + uint8_t pul_sel; ///< pulse case selector for tracks (2 bits each) uint8_t gain; ///< codebooks gain uint8_t energy; ///< high-band energy - uint16_t cbook1[4]; ///< first codebook index for tracks - uint16_t cbook2[4]; ///< second codebook index for tracks + uint16_t pul_ih[4]; ///< MSBs part of codebook index (high modes only) + uint16_t pul_il[4]; ///< LSBs part of codebook index } AMRWBSubFrame; typedef struct { @@ -88,19 +88,19 @@ static const uint16_t order_MODE_6k60[] = { 7, AMR_BIT(isp_id[3]), 59, 60, 61, 62, 63, 76, 77, 6, AMR_BIT(isp_id[4]), 78, 79, 81, 80, 82, 83, 8, AMR_OF(0, adap), 12, 13, 14, 15, 27, 28, 54, 66, - 12, AMR_OF(0, cbook1[0]), 84, 92, 100, 108, 116, 124, 85, 96, + 12, AMR_OF(0, pul_il[0]), 84, 92, 100, 108, 116, 124, 85, 96, 104, 112, 120, 128, 6, AMR_OF(0, vq), 33, 16, 37, 20, 4, 8, 5, AMR_OF(1, adap), 39, 46, 56, 68, 74, - 12, AMR_OF(1, cbook1[0]), 86, 93, 101, 109, 117, 125, 87, 97, + 12, AMR_OF(1, pul_il[0]), 86, 93, 101, 109, 117, 125, 87, 97, 105, 113, 121, 129, 6, AMR_OF(1, vq), 29, 17, 35, 21, 5, 9, 5, AMR_OF(2, adap), 42, 47, 53, 55, 67, - 12, AMR_OF(2, cbook1[0]), 88, 94, 102, 110, 118, 126, 89, 98, + 12, AMR_OF(2, pul_il[0]), 88, 94, 102, 110, 118, 126, 89, 98, 106, 114, 122, 130, 6, AMR_OF(2, vq), 34, 18, 36, 22, 6, 24, 5, AMR_OF(3, adap), 40, 41, 57, 69, 75, - 12, AMR_OF(3, cbook1[0]), 90, 95, 103, 111, 119, 127, 91, 99, + 12, AMR_OF(3, pul_il[0]), 90, 95, 103, 111, 119, 127, 91, 99, 107, 115, 123, 131, 6, AMR_OF(3, vq), 30, 19, 26, 23, 7, 25, 0 @@ -116,28 +116,28 @@ static const uint16_t order_MODE_8k85[] = { 5, AMR_BIT(isp_id[5]), 85, 88, 87, 89, 92, 5, AMR_BIT(isp_id[6]), 93, 94, 95, 96, 80, 8, AMR_OF(0, adap), 6, 7, 8, 36, 38, 61, 71, 83, - 5, AMR_OF(0, cbook1[0]), 97, 113, 129, 145, 161, - 5, AMR_OF(0, cbook1[1]), 98, 117, 133, 149, 165, - 5, AMR_OF(0, cbook1[2]), 99, 121, 137, 153, 169, - 5, AMR_OF(0, cbook1[3]), 100, 125, 141, 157, 173, + 5, AMR_OF(0, pul_il[0]), 97, 113, 129, 145, 161, + 5, AMR_OF(0, pul_il[1]), 98, 117, 133, 149, 165, + 5, AMR_OF(0, pul_il[2]), 99, 121, 137, 153, 169, + 5, AMR_OF(0, pul_il[3]), 100, 125, 141, 157, 173, 6, AMR_OF(0, vq), 12, 32, 20, 24, 28, 16, 5, AMR_OF(1, adap), 41, 64, 69, 75, 90, - 5, AMR_OF(1, cbook1[0]), 101, 114, 130, 146, 162, - 5, AMR_OF(1, cbook1[1]), 102, 118, 134, 150, 166, - 5, AMR_OF(1, cbook1[2]), 103, 122, 138, 154, 170, - 5, AMR_OF(1, cbook1[3]), 104, 126, 142, 158, 174, + 5, AMR_OF(1, pul_il[0]), 101, 114, 130, 146, 162, + 5, AMR_OF(1, pul_il[1]), 102, 118, 134, 150, 166, + 5, AMR_OF(1, pul_il[2]), 103, 122, 138, 154, 170, + 5, AMR_OF(1, pul_il[3]), 104, 126, 142, 158, 174, 6, AMR_OF(1, vq), 13, 33, 21, 25, 29, 17, 8, AMR_OF(2, adap), 9, 10, 11, 37, 42, 62, 72, 84, - 5, AMR_OF(2, cbook1[0]), 105, 115, 131, 147, 163, - 5, AMR_OF(2, cbook1[1]), 106, 119, 135, 151, 167, - 5, AMR_OF(2, cbook1[2]), 107, 123, 139, 155, 171, - 5, AMR_OF(2, cbook1[3]), 108, 127, 143, 159, 175, + 5, AMR_OF(2, pul_il[0]), 105, 115, 131, 147, 163, + 5, AMR_OF(2, pul_il[1]), 106, 119, 135, 151, 167, + 5, AMR_OF(2, pul_il[2]), 107, 123, 139, 155, 171, + 5, AMR_OF(2, pul_il[3]), 108, 127, 143, 159, 175, 6, AMR_OF(2, vq), 14, 34, 22, 26, 30, 18, 5, AMR_OF(3, adap), 43, 65, 70, 76, 91, - 5, AMR_OF(3, cbook1[0]), 109, 116, 132, 148, 164, - 5, AMR_OF(3, cbook1[1]), 110, 120, 136, 152, 168, - 5, AMR_OF(3, cbook1[2]), 111, 124, 140, 156, 172, - 5, AMR_OF(3, cbook1[3]), 112, 128, 144, 160, 176, + 5, AMR_OF(3, pul_il[0]), 109, 116, 132, 148, 164, + 5, AMR_OF(3, pul_il[1]), 110, 120, 136, 152, 168, + 5, AMR_OF(3, pul_il[2]), 111, 124, 140, 156, 172, + 5, AMR_OF(3, pul_il[3]), 112, 128, 144, 160, 176, 6, AMR_OF(3, vq), 15, 35, 23, 27, 31, 19, 0 }; @@ -154,47 +154,47 @@ static const uint16_t order_MODE_12k65[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 9, AMR_OF(0, cbook1[0]), 109, 125, 157, 189, 221, 129, 161, 193, + 9, AMR_OF(0, pul_il[0]), 109, 125, 157, 189, 221, 129, 161, 193, 225, - 9, AMR_OF(0, cbook1[1]), 110, 133, 165, 197, 229, 137, 169, 201, + 9, AMR_OF(0, pul_il[1]), 110, 133, 165, 197, 229, 137, 169, 201, 233, - 9, AMR_OF(0, cbook1[2]), 111, 141, 173, 205, 237, 145, 177, 209, + 9, AMR_OF(0, pul_il[2]), 111, 141, 173, 205, 237, 145, 177, 209, 241, - 9, AMR_OF(0, cbook1[3]), 112, 149, 181, 213, 245, 153, 185, 217, + 9, AMR_OF(0, pul_il[3]), 112, 149, 181, 213, 245, 153, 185, 217, 249, 7, AMR_OF(0, vq), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(2, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(2, ltp), 106, - 9, AMR_OF(2, cbook1[0]), 113, 126, 158, 190, 222, 130, 162, 194, + 9, AMR_OF(2, pul_il[0]), 113, 126, 158, 190, 222, 130, 162, 194, 226, - 9, AMR_OF(2, cbook1[1]), 114, 134, 166, 198, 230, 138, 170, 202, + 9, AMR_OF(2, pul_il[1]), 114, 134, 166, 198, 230, 138, 170, 202, 234, - 9, AMR_OF(2, cbook1[2]), 115, 142, 174, 206, 238, 146, 178, 210, + 9, AMR_OF(2, pul_il[2]), 115, 142, 174, 206, 238, 146, 178, 210, 242, - 9, AMR_OF(2, cbook1[3]), 116, 150, 182, 214, 246, 154, 186, 218, + 9, AMR_OF(2, pul_il[3]), 116, 150, 182, 214, 246, 154, 186, 218, 250, 7, AMR_OF(2, vq), 4, 21, 43, 29, 33, 39, 25, 9, AMR_OF(3, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(3, ltp), 107, - 9, AMR_OF(3, cbook1[0]), 117, 127, 159, 191, 223, 131, 163, 195, + 9, AMR_OF(3, pul_il[0]), 117, 127, 159, 191, 223, 131, 163, 195, 227, - 9, AMR_OF(3, cbook1[1]), 118, 135, 167, 199, 231, 139, 171, 203, + 9, AMR_OF(3, pul_il[1]), 118, 135, 167, 199, 231, 139, 171, 203, 235, - 9, AMR_OF(3, cbook1[2]), 119, 143, 175, 207, 239, 147, 179, 211, + 9, AMR_OF(3, pul_il[2]), 119, 143, 175, 207, 239, 147, 179, 211, 243, - 9, AMR_OF(3, cbook1[3]), 120, 151, 183, 215, 247, 155, 187, 219, + 9, AMR_OF(3, pul_il[3]), 120, 151, 183, 215, 247, 155, 187, 219, 251, 7, AMR_OF(3, vq), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(4, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(4, ltp), 108, - 9, AMR_OF(4, cbook1[0]), 121, 128, 160, 192, 224, 132, 164, 196, + 9, AMR_OF(4, pul_il[0]), 121, 128, 160, 192, 224, 132, 164, 196, 228, - 9, AMR_OF(4, cbook1[1]), 122, 136, 168, 200, 232, 140, 172, 204, + 9, AMR_OF(4, pul_il[1]), 122, 136, 168, 200, 232, 140, 172, 204, 236, - 9, AMR_OF(4, cbook1[2]), 123, 144, 176, 208, 240, 148, 180, 212, + 9, AMR_OF(4, pul_il[2]), 123, 144, 176, 208, 240, 148, 180, 212, 244, - 9, AMR_OF(4, cbook1[3]), 124, 152, 184, 216, 248, 156, 188, 220, + 9, AMR_OF(4, pul_il[3]), 124, 152, 184, 216, 248, 156, 188, 220, 252, 7, AMR_OF(4, vq), 6, 23, 45, 31, 35, 41, 27, 0 @@ -212,47 +212,47 @@ static const uint16_t order_MODE_14k25[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 13, AMR_OF(0, cbook1[0]), 117, 189, 213, 237, 261, 109, 121, 165, + 13, AMR_OF(0, pul_il[0]), 117, 189, 213, 237, 261, 109, 121, 165, 173, 193, 217, 241, 265, - 13, AMR_OF(0, cbook1[1]), 125, 197, 221, 245, 269, 113, 129, 169, + 13, AMR_OF(0, pul_il[1]), 125, 197, 221, 245, 269, 113, 129, 169, 177, 201, 225, 249, 273, - 9, AMR_OF(0, cbook1[2]), 133, 141, 149, 157, 181, 205, 229, 253, + 9, AMR_OF(0, pul_il[2]), 133, 141, 149, 157, 181, 205, 229, 253, 277, - 9, AMR_OF(0, cbook1[3]), 137, 145, 153, 161, 185, 209, 233, 257, + 9, AMR_OF(0, pul_il[3]), 137, 145, 153, 161, 185, 209, 233, 257, 281, 7, AMR_OF(0, vq), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(1, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(1, ltp), 106, - 13, AMR_OF(1, cbook1[0]), 118, 190, 214, 238, 262, 110, 122, 166, + 13, AMR_OF(1, pul_il[0]), 118, 190, 214, 238, 262, 110, 122, 166, 174, 194, 218, 242, 266, - 13, AMR_OF(1, cbook1[1]), 126, 198, 222, 246, 270, 114, 130, 170, + 13, AMR_OF(1, pul_il[1]), 126, 198, 222, 246, 270, 114, 130, 170, 178, 202, 226, 250, 274, - 9, AMR_OF(1, cbook1[2]), 134, 142, 150, 158, 182, 206, 230, 254, + 9, AMR_OF(1, pul_il[2]), 134, 142, 150, 158, 182, 206, 230, 254, 278, - 9, AMR_OF(1, cbook1[3]), 138, 146, 154, 162, 186, 210, 234, 258, + 9, AMR_OF(1, pul_il[3]), 138, 146, 154, 162, 186, 210, 234, 258, 282, 7, AMR_OF(1, vq), 4, 21, 43, 29, 33, 39, 25, 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(2, ltp), 107, - 13, AMR_OF(2, cbook1[0]), 119, 191, 215, 239, 263, 111, 123, 167, + 13, AMR_OF(2, pul_il[0]), 119, 191, 215, 239, 263, 111, 123, 167, 175, 195, 219, 243, 267, - 13, AMR_OF(2, cbook1[1]), 127, 199, 223, 247, 271, 115, 131, 171, + 13, AMR_OF(2, pul_il[1]), 127, 199, 223, 247, 271, 115, 131, 171, 179, 203, 227, 251, 275, - 9, AMR_OF(2, cbook1[2]), 135, 143, 151, 159, 183, 207, 231, 255, + 9, AMR_OF(2, pul_il[2]), 135, 143, 151, 159, 183, 207, 231, 255, 279, - 9, AMR_OF(2, cbook1[3]), 139, 147, 155, 163, 187, 211, 235, 259, + 9, AMR_OF(2, pul_il[3]), 139, 147, 155, 163, 187, 211, 235, 259, 283, 7, AMR_OF(2, vq), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(3, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(3, ltp), 108, - 13, AMR_OF(3, cbook1[0]), 120, 192, 216, 240, 264, 112, 124, 168, + 13, AMR_OF(3, pul_il[0]), 120, 192, 216, 240, 264, 112, 124, 168, 176, 196, 220, 244, 268, - 13, AMR_OF(3, cbook1[1]), 128, 200, 224, 248, 272, 116, 132, 172, + 13, AMR_OF(3, pul_il[1]), 128, 200, 224, 248, 272, 116, 132, 172, 180, 204, 228, 252, 276, - 9, AMR_OF(3, cbook1[2]), 136, 144, 152, 160, 184, 208, 232, 256, + 9, AMR_OF(3, pul_il[2]), 136, 144, 152, 160, 184, 208, 232, 256, 280, - 9, AMR_OF(3, cbook1[3]), 140, 148, 156, 164, 188, 212, 236, 260, + 9, AMR_OF(3, pul_il[3]), 140, 148, 156, 164, 188, 212, 236, 260, 284, 7, AMR_OF(3, vq), 6, 23, 45, 31, 35, 41, 27, 0 @@ -270,47 +270,47 @@ static const uint16_t order_MODE_15k85[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 13, AMR_OF(0, cbook1[0]), 125, 157, 173, 221, 269, 141, 109, 177, + 13, AMR_OF(0, pul_il[0]), 125, 157, 173, 221, 269, 141, 109, 177, 225, 273, 181, 229, 277, - 13, AMR_OF(0, cbook1[1]), 129, 161, 185, 233, 281, 145, 113, 189, + 13, AMR_OF(0, pul_il[1]), 129, 161, 185, 233, 281, 145, 113, 189, 237, 285, 193, 241, 289, - 13, AMR_OF(0, cbook1[2]), 133, 165, 197, 245, 293, 149, 117, 201, + 13, AMR_OF(0, pul_il[2]), 133, 165, 197, 245, 293, 149, 117, 201, 249, 297, 205, 253, 301, - 13, AMR_OF(0, cbook1[3]), 137, 169, 209, 257, 305, 153, 121, 213, + 13, AMR_OF(0, pul_il[3]), 137, 169, 209, 257, 305, 153, 121, 213, 261, 309, 217, 265, 313, 7, AMR_OF(0, vq), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(1, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(1, ltp), 106, - 13, AMR_OF(1, cbook1[0]), 126, 158, 174, 222, 270, 142, 110, 178, + 13, AMR_OF(1, pul_il[0]), 126, 158, 174, 222, 270, 142, 110, 178, 226, 274, 182, 230, 278, - 13, AMR_OF(1, cbook1[1]), 130, 162, 186, 234, 282, 146, 114, 190, + 13, AMR_OF(1, pul_il[1]), 130, 162, 186, 234, 282, 146, 114, 190, 238, 286, 194, 242, 290, - 13, AMR_OF(1, cbook1[2]), 134, 166, 198, 246, 294, 150, 118, 202, + 13, AMR_OF(1, pul_il[2]), 134, 166, 198, 246, 294, 150, 118, 202, 250, 298, 206, 254, 302, - 13, AMR_OF(1, cbook1[3]), 138, 170, 210, 258, 306, 154, 122, 214, + 13, AMR_OF(1, pul_il[3]), 138, 170, 210, 258, 306, 154, 122, 214, 262, 310, 218, 266, 314, 7, AMR_OF(1, vq), 4, 21, 43, 29, 33, 39, 25, 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(2, ltp), 107, - 13, AMR_OF(2, cbook1[0]), 127, 159, 175, 223, 271, 143, 111, 179, + 13, AMR_OF(2, pul_il[0]), 127, 159, 175, 223, 271, 143, 111, 179, 227, 275, 183, 231, 279, - 13, AMR_OF(2, cbook1[1]), 131, 163, 187, 235, 283, 147, 115, 191, + 13, AMR_OF(2, pul_il[1]), 131, 163, 187, 235, 283, 147, 115, 191, 239, 287, 195, 243, 291, - 13, AMR_OF(2, cbook1[2]), 135, 167, 199, 247, 295, 151, 119, 203, + 13, AMR_OF(2, pul_il[2]), 135, 167, 199, 247, 295, 151, 119, 203, 251, 299, 207, 255, 303, - 13, AMR_OF(2, cbook1[3]), 139, 171, 211, 259, 307, 155, 123, 215, + 13, AMR_OF(2, pul_il[3]), 139, 171, 211, 259, 307, 155, 123, 215, 263, 311, 219, 267, 315, 7, AMR_OF(2, vq), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(3, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(3, ltp), 108, - 13, AMR_OF(3, cbook1[0]), 128, 160, 176, 224, 272, 144, 112, 180, + 13, AMR_OF(3, pul_il[0]), 128, 160, 176, 224, 272, 144, 112, 180, 228, 276, 184, 232, 280, - 13, AMR_OF(3, cbook1[1]), 132, 164, 188, 236, 284, 148, 116, 192, + 13, AMR_OF(3, pul_il[1]), 132, 164, 188, 236, 284, 148, 116, 192, 240, 288, 196, 244, 292, - 13, AMR_OF(3, cbook1[2]), 136, 168, 200, 248, 296, 152, 120, 204, + 13, AMR_OF(3, pul_il[2]), 136, 168, 200, 248, 296, 152, 120, 204, 252, 300, 208, 256, 304, - 13, AMR_OF(3, cbook1[3]), 140, 172, 212, 260, 308, 156, 124, 216, + 13, AMR_OF(3, pul_il[3]), 140, 172, 212, 260, 308, 156, 124, 216, 264, 312, 220, 268, 316, 7, AMR_OF(3, vq), 6, 23, 45, 31, 35, 41, 27, 0 @@ -328,51 +328,51 @@ static const uint16_t order_MODE_18k25[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 8, AMR_OF(0, pulse), 123, 116, 145, 114, 134, 117, 126, 132, - 14, AMR_OF(0, cbook1[0]), 166, 262, 336, 192, 182, 296, 203, 170, + 8, AMR_OF(0, pul_sel), 123, 116, 145, 114, 134, 117, 126, 132, + 14, AMR_OF(0, pul_il[0]), 166, 262, 336, 192, 182, 296, 203, 170, 175, 259, 274, 308, 341, 135, - 14, AMR_OF(0, cbook1[1]), 197, 281, 348, 217, 209, 315, 235, 159, + 14, AMR_OF(0, pul_il[1]), 197, 281, 348, 217, 209, 315, 235, 159, 161, 245, 283, 307, 351, 137, - 14, AMR_OF(0, cbook1[2]), 174, 278, 358, 205, 186, 304, 247, 207, + 14, AMR_OF(0, pul_il[2]), 174, 278, 358, 205, 186, 304, 247, 207, 172, 258, 306, 303, 350, 133, - 14, AMR_OF(0, cbook1[3]), 193, 276, 346, 188, 164, 285, 198, 196, + 14, AMR_OF(0, pul_il[3]), 193, 276, 346, 188, 164, 285, 198, 196, 168, 237, 270, 294, 335, 112, 7, AMR_OF(0, vq), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(1, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(1, ltp), 106, - 8, AMR_OF(1, pulse), 140, 111, 128, 113, 119, 120, 139, 138, - 14, AMR_OF(1, cbook1[0]), 180, 275, 339, 230, 216, 326, 236, 185, + 8, AMR_OF(1, pul_sel), 140, 111, 128, 113, 119, 120, 139, 138, + 14, AMR_OF(1, pul_il[0]), 180, 275, 339, 230, 216, 326, 236, 185, 177, 264, 305, 316, 359, 122, - 14, AMR_OF(1, cbook1[1]), 158, 271, 334, 239, 214, 324, 224, 162, + 14, AMR_OF(1, pul_il[1]), 158, 271, 334, 239, 214, 324, 224, 162, 184, 272, 293, 319, 360, 129, - 14, AMR_OF(1, cbook1[2]), 160, 266, 338, 202, 194, 301, 231, 167, + 14, AMR_OF(1, pul_il[2]), 160, 266, 338, 202, 194, 301, 231, 167, 173, 260, 287, 314, 354, 147, - 14, AMR_OF(1, cbook1[3]), 204, 279, 337, 228, 199, 300, 238, 171, + 14, AMR_OF(1, pul_il[3]), 204, 279, 337, 228, 199, 300, 238, 171, 176, 263, 284, 321, 356, 109, 7, AMR_OF(1, vq), 4, 21, 43, 29, 33, 39, 25, 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(2, ltp), 107, - 8, AMR_OF(2, pulse), 151, 127, 154, 124, 150, 141, 131, 157, - 14, AMR_OF(2, cbook1[0]), 246, 312, 362, 251, 250, 332, 249, 225, + 8, AMR_OF(2, pul_sel), 151, 127, 154, 124, 150, 141, 131, 157, + 14, AMR_OF(2, pul_il[0]), 246, 312, 362, 251, 250, 332, 249, 225, 219, 256, 282, 317, 363, 155, - 14, AMR_OF(2, cbook1[1]), 240, 292, 340, 254, 253, 331, 268, 195, + 14, AMR_OF(2, pul_il[1]), 240, 292, 340, 254, 253, 331, 268, 195, 200, 267, 311, 323, 355, 153, - 14, AMR_OF(2, cbook1[2]), 213, 299, 347, 244, 234, 330, 241, 201, + 14, AMR_OF(2, pul_il[2]), 213, 299, 347, 244, 234, 330, 241, 201, 220, 269, 313, 328, 364, 152, - 14, AMR_OF(2, cbook1[3]), 232, 309, 361, 218, 229, 302, 252, 191, + 14, AMR_OF(2, pul_il[3]), 232, 309, 361, 218, 229, 302, 252, 191, 181, 261, 291, 310, 349, 115, 7, AMR_OF(2, vq), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(3, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(3, ltp), 108, - 8, AMR_OF(3, pulse), 136, 121, 142, 125, 146, 110, 130, 143, - 14, AMR_OF(3, cbook1[0]), 165, 280, 342, 243, 226, 325, 221, 179, + 8, AMR_OF(3, pul_sel), 136, 121, 142, 125, 146, 110, 130, 143, + 14, AMR_OF(3, pul_il[0]), 165, 280, 342, 243, 226, 325, 221, 179, 189, 257, 277, 295, 344, 149, - 14, AMR_OF(3, cbook1[1]), 211, 289, 353, 255, 227, 329, 208, 169, + 14, AMR_OF(3, pul_il[1]), 211, 289, 353, 255, 227, 329, 208, 169, 183, 265, 290, 298, 357, 148, - 14, AMR_OF(3, cbook1[2]), 190, 320, 343, 212, 210, 318, 242, 178, + 14, AMR_OF(3, pul_il[2]), 190, 320, 343, 212, 210, 318, 242, 178, 187, 248, 286, 322, 345, 144, - 14, AMR_OF(3, cbook1[3]), 206, 288, 352, 223, 215, 327, 233, 163, + 14, AMR_OF(3, pul_il[3]), 206, 288, 352, 223, 215, 327, 233, 163, 156, 222, 273, 297, 333, 118, 7, AMR_OF(3, vq), 6, 23, 45, 31, 35, 41, 27, 0 @@ -390,67 +390,67 @@ static const uint16_t order_MODE_19k85[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 10, AMR_OF(0, cbook1[0]), 129, 158, 256, 337, 392, 157, 109, 182, + 10, AMR_OF(0, pul_ih[0]), 129, 158, 256, 337, 392, 157, 109, 182, 314, 270, - 10, AMR_OF(0, cbook1[1]), 135, 160, 265, 344, 390, 167, 110, 210, + 10, AMR_OF(0, pul_ih[1]), 135, 160, 265, 344, 390, 167, 110, 210, 334, 260, - 4, AMR_OF(0, pulse), 124, 148, 132, 136, - 10, AMR_OF(0, cbook1[0]), 349, 113, 173, 206, 303, 375, 253, 283, + 4, AMR_OF(0, pul_sel), 124, 148, 132, 136, + 10, AMR_OF(0, pul_ih[0]), 349, 113, 173, 206, 303, 375, 253, 283, 338, 384, - 10, AMR_OF(0, cbook2[1]), 350, 111, 161, 195, 286, 369, 245, 266, + 10, AMR_OF(0, pul_il[1]), 350, 111, 161, 195, 286, 369, 245, 266, 320, 385, - 14, AMR_OF(0, cbook1[2]), 138, 172, 292, 363, 226, 213, 307, 227, + 14, AMR_OF(0, pul_ih[2]), 138, 172, 292, 363, 226, 213, 307, 227, 201, 207, 261, 288, 318, 366, - 14, AMR_OF(0, cbook1[3]), 151, 187, 285, 361, 222, 223, 306, 221, + 14, AMR_OF(0, pul_ih[3]), 151, 187, 285, 361, 222, 223, 306, 221, 198, 177, 242, 280, 299, 360, 7, AMR_OF(0, vq), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(1, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(1, ltp), 106, - 10, AMR_OF(1, cbook1[0]), 140, 174, 268, 347, 386, 164, 115, 186, + 10, AMR_OF(1, pul_ih[0]), 140, 174, 268, 347, 386, 164, 115, 186, 336, 267, - 10, AMR_OF(1, cbook1[1]), 127, 166, 254, 340, 394, 159, 117, 225, + 10, AMR_OF(1, pul_ih[1]), 127, 166, 254, 340, 394, 159, 117, 225, 329, 296, - 4, AMR_OF(1, pulse), 122, 141, 119, 134, - 10, AMR_OF(1, cbook1[0]), 346, 125, 165, 204, 295, 371, 273, 277, + 4, AMR_OF(1, pul_sel), 122, 141, 119, 134, + 10, AMR_OF(1, pul_ih[0]), 346, 125, 165, 204, 295, 371, 273, 277, 319, 382, - 10, AMR_OF(1, cbook2[1]), 354, 121, 162, 209, 301, 365, 251, 259, + 10, AMR_OF(1, pul_il[1]), 354, 121, 162, 209, 301, 365, 251, 259, 326, 381, - 14, AMR_OF(1, cbook1[2]), 145, 192, 269, 356, 212, 179, 282, 246, + 14, AMR_OF(1, pul_ih[2]), 145, 192, 269, 356, 212, 179, 282, 246, 196, 193, 244, 276, 324, 368, - 14, AMR_OF(1, cbook1[3]), 137, 184, 263, 358, 215, 219, 317, 234, + 14, AMR_OF(1, pul_ih[3]), 137, 184, 263, 358, 215, 219, 317, 234, 185, 211, 248, 311, 313, 372, 7, AMR_OF(1, vq), 4, 21, 43, 29, 33, 39, 25, 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(2, ltp), 107, - 10, AMR_OF(2, cbook1[0]), 152, 175, 297, 355, 396, 181, 131, 190, + 10, AMR_OF(2, pul_ih[0]), 152, 175, 297, 355, 396, 181, 131, 190, 333, 281, - 10, AMR_OF(2, cbook1[1]), 153, 178, 291, 353, 395, 183, 130, 236, + 10, AMR_OF(2, pul_ih[1]), 153, 178, 291, 353, 395, 183, 130, 236, 332, 275, - 4, AMR_OF(2, pulse), 133, 154, 123, 143, - 10, AMR_OF(2, cbook1[0]), 357, 126, 197, 241, 325, 380, 279, 278, + 4, AMR_OF(2, pul_sel), 133, 154, 123, 143, + 10, AMR_OF(2, pul_ih[0]), 357, 126, 197, 241, 325, 380, 279, 278, 331, 393, - 10, AMR_OF(2, cbook2[1]), 352, 139, 189, 235, 330, 383, 293, 298, + 10, AMR_OF(2, pul_il[1]), 352, 139, 189, 235, 330, 383, 293, 298, 341, 388, - 14, AMR_OF(2, cbook1[2]), 156, 228, 312, 374, 250, 249, 345, 255, + 14, AMR_OF(2, pul_ih[2]), 156, 228, 312, 374, 250, 249, 345, 255, 231, 232, 247, 290, 316, 376, - 14, AMR_OF(2, cbook1[3]), 155, 214, 302, 370, 230, 208, 321, 240, + 14, AMR_OF(2, pul_ih[3]), 155, 214, 302, 370, 230, 208, 321, 240, 194, 191, 239, 294, 305, 362, 7, AMR_OF(2, vq), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(3, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(3, ltp), 108, - 10, AMR_OF(3, cbook1[0]), 147, 163, 271, 339, 387, 176, 114, 202, + 10, AMR_OF(3, pul_ih[0]), 147, 163, 271, 339, 387, 176, 114, 202, 343, 258, - 10, AMR_OF(3, cbook1[1]), 149, 169, 262, 328, 391, 170, 118, 188, + 10, AMR_OF(3, pul_ih[1]), 149, 169, 262, 328, 391, 170, 118, 188, 327, 272, - 4, AMR_OF(3, pulse), 120, 144, 112, 142, - 10, AMR_OF(3, cbook1[0]), 359, 128, 171, 233, 309, 378, 257, 264, + 4, AMR_OF(3, pul_sel), 120, 144, 112, 142, + 10, AMR_OF(3, pul_ih[0]), 359, 128, 171, 233, 309, 378, 257, 264, 335, 377, - 10, AMR_OF(3, cbook2[1]), 348, 116, 180, 220, 310, 379, 274, 289, + 10, AMR_OF(3, pul_il[1]), 348, 116, 180, 220, 310, 379, 274, 289, 342, 389, - 14, AMR_OF(3, cbook1[2]), 150, 199, 308, 373, 237, 216, 323, 243, + 14, AMR_OF(3, pul_ih[2]), 150, 199, 308, 373, 237, 216, 323, 243, 205, 203, 252, 300, 322, 367, - 14, AMR_OF(3, cbook1[3]), 146, 218, 304, 364, 229, 217, 315, 224, + 14, AMR_OF(3, pul_ih[3]), 146, 218, 304, 364, 229, 217, 315, 224, 200, 168, 238, 287, 284, 351, 7, AMR_OF(3, vq), 6, 23, 45, 31, 35, 41, 27, 0 @@ -468,79 +468,79 @@ static const uint16_t order_MODE_23k05[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 79, 91, 1, AMR_OF(0, ltp), 105, - 11, AMR_OF(0, cbook1[0]), 113, 134, 132, 158, 173, 285, 301, 213, + 11, AMR_OF(0, pul_ih[0]), 113, 134, 132, 158, 173, 285, 301, 213, 184, 354, 314, - 11, AMR_OF(0, cbook1[1]), 121, 149, 128, 162, 188, 278, 350, 288, + 11, AMR_OF(0, pul_ih[1]), 121, 149, 128, 162, 188, 278, 350, 288, 171, 341, 339, - 11, AMR_OF(0, cbook1[2]), 112, 142, 138, 160, 215, 311, 361, 263, + 11, AMR_OF(0, pul_ih[2]), 112, 142, 138, 160, 215, 311, 361, 263, 182, 340, 335, - 11, AMR_OF(0, cbook1[3]), 115, 133, 127, 161, 185, 251, 304, 232, + 11, AMR_OF(0, pul_ih[3]), 115, 133, 127, 161, 185, 251, 304, 232, 170, 336, 313, - 11, AMR_OF(0, cbook2[0]), 242, 179, 337, 431, 260, 274, 269, 379, + 11, AMR_OF(0, pul_il[0]), 242, 179, 337, 431, 260, 274, 269, 379, 393, 416, 447, - 11, AMR_OF(0, cbook2[1]), 221, 200, 360, 437, 206, 247, 276, 364, + 11, AMR_OF(0, pul_il[1]), 221, 200, 360, 437, 206, 247, 276, 364, 392, 420, 451, - 11, AMR_OF(0, cbook2[2]), 277, 187, 347, 430, 245, 203, 257, 362, + 11, AMR_OF(0, pul_il[2]), 277, 187, 347, 430, 245, 203, 257, 362, 405, 424, 456, - 11, AMR_OF(0, cbook2[3]), 218, 176, 342, 432, 244, 223, 252, 357, + 11, AMR_OF(0, pul_il[3]), 218, 176, 342, 432, 244, 223, 252, 357, 385, 412, 457, 7, AMR_OF(0, gain), 3, 20, 42, 28, 32, 38, 24, 6, AMR_OF(1, adap), 36, 49, 72, 77, 83, 98, 1, AMR_OF(1, ltp), 106, - 11, AMR_OF(1, cbook1[0]), 116, 139, 137, 166, 225, 292, 344, 236, + 11, AMR_OF(1, pul_ih[0]), 116, 139, 137, 166, 225, 292, 344, 236, 178, 290, 305, - 11, AMR_OF(1, cbook1[1]), 111, 141, 131, 165, 212, 316, 348, 238, + 11, AMR_OF(1, pul_ih[1]), 111, 141, 131, 165, 212, 316, 348, 238, 183, 327, 334, - 11, AMR_OF(1, cbook1[2]), 109, 129, 122, 157, 202, 268, 309, 219, + 11, AMR_OF(1, pul_ih[2]), 109, 129, 122, 157, 202, 268, 309, 219, 190, 333, 302, - 11, AMR_OF(1, cbook1[3]), 110, 147, 125, 159, 208, 297, 345, 249, + 11, AMR_OF(1, pul_ih[3]), 110, 147, 125, 159, 208, 297, 345, 249, 181, 312, 318, - 11, AMR_OF(1, cbook2[0]), 266, 186, 377, 439, 279, 227, 256, 376, + 11, AMR_OF(1, pul_il[0]), 266, 186, 377, 439, 279, 227, 256, 376, 401, 417, 450, - 11, AMR_OF(1, cbook2[1]), 281, 201, 382, 441, 229, 217, 270, 375, + 11, AMR_OF(1, pul_il[1]), 281, 201, 382, 441, 229, 217, 270, 375, 403, 423, 449, - 11, AMR_OF(1, cbook2[2]), 240, 196, 353, 442, 231, 235, 306, 338, + 11, AMR_OF(1, pul_il[2]), 240, 196, 353, 442, 231, 235, 306, 338, 368, 415, 454, - 11, AMR_OF(1, cbook2[3]), 230, 199, 352, 435, 253, 261, 293, 386, + 11, AMR_OF(1, pul_il[3]), 230, 199, 352, 435, 253, 261, 293, 386, 407, 419, 455, 7, AMR_OF(1, gain), 4, 21, 43, 29, 33, 39, 25, 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 80, 92, 1, AMR_OF(2, ltp), 107, - 11, AMR_OF(2, cbook1[0]), 140, 151, 150, 174, 237, 320, 396, 300, + 11, AMR_OF(2, pul_ih[0]), 140, 151, 150, 174, 237, 320, 396, 300, 243, 355, 380, - 11, AMR_OF(2, cbook1[1]), 120, 155, 153, 172, 224, 307, 394, 356, + 11, AMR_OF(2, pul_ih[1]), 120, 155, 153, 172, 224, 307, 394, 356, 258, 372, 328, - 11, AMR_OF(2, cbook1[2]), 124, 156, 154, 198, 246, 365, 391, 324, + 11, AMR_OF(2, pul_ih[2]), 124, 156, 154, 198, 246, 365, 391, 324, 233, 399, 366, - 11, AMR_OF(2, cbook1[3]), 117, 148, 126, 168, 195, 330, 370, 296, + 11, AMR_OF(2, pul_ih[3]), 117, 148, 126, 168, 195, 330, 370, 296, 191, 358, 325, - 11, AMR_OF(2, cbook2[0]), 264, 204, 390, 445, 308, 275, 329, 402, + 11, AMR_OF(2, pul_il[0]), 264, 204, 390, 445, 308, 275, 329, 402, 411, 428, 460, - 11, AMR_OF(2, cbook2[1]), 273, 207, 387, 440, 291, 295, 303, 404, + 11, AMR_OF(2, pul_il[1]), 273, 207, 387, 440, 291, 295, 303, 404, 408, 426, 459, - 11, AMR_OF(2, cbook2[2]), 319, 209, 398, 438, 272, 298, 317, 384, + 11, AMR_OF(2, pul_il[2]), 319, 209, 398, 438, 272, 298, 317, 384, 413, 429, 453, - 11, AMR_OF(2, cbook2[3]), 287, 189, 383, 434, 267, 259, 248, 363, + 11, AMR_OF(2, pul_il[3]), 287, 189, 383, 434, 267, 259, 248, 363, 409, 422, 446, 7, AMR_OF(2, gain), 5, 22, 44, 30, 34, 40, 26, 6, AMR_OF(3, adap), 37, 50, 73, 78, 84, 99, 1, AMR_OF(3, ltp), 108, - 11, AMR_OF(3, cbook1[0]), 119, 152, 136, 163, 210, 286, 331, 283, + 11, AMR_OF(3, pul_ih[0]), 119, 152, 136, 163, 210, 286, 331, 283, 175, 351, 322, - 11, AMR_OF(3, cbook1[1]), 118, 145, 146, 180, 192, 315, 323, 282, + 11, AMR_OF(3, pul_ih[1]), 118, 145, 146, 180, 192, 315, 323, 282, 234, 367, 343, - 11, AMR_OF(3, cbook1[2]), 123, 143, 144, 169, 214, 321, 346, 255, + 11, AMR_OF(3, pul_ih[2]), 123, 143, 144, 169, 214, 321, 346, 255, 193, 369, 332, - 11, AMR_OF(3, cbook1[3]), 114, 135, 130, 164, 205, 299, 371, 310, + 11, AMR_OF(3, pul_ih[3]), 114, 135, 130, 164, 205, 299, 371, 310, 197, 388, 326, - 11, AMR_OF(3, cbook2[0]), 254, 177, 359, 427, 250, 271, 294, 410, + 11, AMR_OF(3, pul_il[0]), 254, 177, 359, 427, 250, 271, 294, 410, 400, 421, 458, - 11, AMR_OF(3, cbook2[1]), 280, 211, 374, 443, 216, 241, 222, 349, + 11, AMR_OF(3, pul_il[1]), 280, 211, 374, 443, 216, 241, 222, 349, 397, 406, 452, - 11, AMR_OF(3, cbook2[2]), 220, 194, 381, 436, 226, 262, 284, 395, + 11, AMR_OF(3, pul_il[2]), 220, 194, 381, 436, 226, 262, 284, 395, 414, 425, 448, - 11, AMR_OF(3, cbook2[3]), 239, 167, 373, 433, 228, 265, 289, 378, + 11, AMR_OF(3, pul_il[3]), 239, 167, 373, 433, 228, 265, 289, 378, 389, 418, 444, 7, AMR_OF(3, gain), 6, 23, 45, 31, 35, 41, 27, 0 @@ -558,82 +558,82 @@ static const uint16_t order_MODE_23k85[] = { 9, AMR_OF(0, adap), 10, 11, 12, 13, 14, 46, 69, 95, 107, 1, AMR_OF(0, ltp), 121, - 11, AMR_OF(0, cbook1[0]), 129, 150, 148, 174, 189, 301, 317, 229, + 11, AMR_OF(0, pul_ih[0]), 129, 150, 148, 174, 189, 301, 317, 229, 200, 370, 330, - 11, AMR_OF(0, cbook1[1]), 137, 165, 144, 178, 204, 294, 366, 304, + 11, AMR_OF(0, pul_ih[1]), 137, 165, 144, 178, 204, 294, 366, 304, 187, 357, 355, - 11, AMR_OF(0, cbook1[2]), 128, 158, 154, 176, 231, 327, 377, 279, + 11, AMR_OF(0, pul_ih[2]), 128, 158, 154, 176, 231, 327, 377, 279, 198, 356, 351, - 11, AMR_OF(0, cbook1[3]), 131, 149, 143, 177, 201, 267, 320, 248, + 11, AMR_OF(0, pul_ih[3]), 131, 149, 143, 177, 201, 267, 320, 248, 186, 352, 329, - 11, AMR_OF(0, cbook2[0]), 258, 195, 353, 447, 276, 290, 285, 395, + 11, AMR_OF(0, pul_il[0]), 258, 195, 353, 447, 276, 290, 285, 395, 409, 432, 463, - 11, AMR_OF(0, cbook2[1]), 237, 216, 376, 453, 222, 263, 292, 380, + 11, AMR_OF(0, pul_il[1]), 237, 216, 376, 453, 222, 263, 292, 380, 408, 436, 467, - 11, AMR_OF(0, cbook2[2]), 293, 203, 363, 446, 261, 219, 273, 378, + 11, AMR_OF(0, pul_il[2]), 293, 203, 363, 446, 261, 219, 273, 378, 421, 440, 472, - 11, AMR_OF(0, cbook2[3]), 234, 192, 358, 448, 260, 239, 268, 373, + 11, AMR_OF(0, pul_il[3]), 234, 192, 358, 448, 260, 239, 268, 373, 401, 428, 473, 7, AMR_OF(0, gain), 3, 20, 42, 28, 32, 38, 24, 4, AMR_OF(0, energy), 72, 73, 74, 75, 6, AMR_OF(1, adap), 36, 49, 88, 93, 99, 114, 1, AMR_OF(1, ltp), 122, - 11, AMR_OF(1, cbook1[0]), 132, 155, 153, 182, 241, 308, 360, 252, + 11, AMR_OF(1, pul_ih[0]), 132, 155, 153, 182, 241, 308, 360, 252, 194, 306, 321, - 11, AMR_OF(1, cbook1[1]), 127, 157, 147, 181, 228, 332, 364, 254, + 11, AMR_OF(1, pul_ih[1]), 127, 157, 147, 181, 228, 332, 364, 254, 199, 343, 350, - 11, AMR_OF(1, cbook1[2]), 125, 145, 138, 173, 218, 284, 325, 235, + 11, AMR_OF(1, pul_ih[2]), 125, 145, 138, 173, 218, 284, 325, 235, 206, 349, 318, - 11, AMR_OF(1, cbook1[3]), 126, 163, 141, 175, 224, 313, 361, 265, + 11, AMR_OF(1, pul_ih[3]), 126, 163, 141, 175, 224, 313, 361, 265, 197, 328, 334, - 11, AMR_OF(1, cbook2[0]), 282, 202, 393, 455, 295, 243, 272, 392, + 11, AMR_OF(1, pul_il[0]), 282, 202, 393, 455, 295, 243, 272, 392, 417, 433, 466, - 11, AMR_OF(1, cbook2[1]), 297, 217, 398, 457, 245, 233, 286, 391, + 11, AMR_OF(1, pul_il[1]), 297, 217, 398, 457, 245, 233, 286, 391, 419, 439, 465, - 11, AMR_OF(1, cbook2[2]), 256, 212, 369, 458, 247, 251, 322, 354, + 11, AMR_OF(1, pul_il[2]), 256, 212, 369, 458, 247, 251, 322, 354, 384, 431, 470, - 11, AMR_OF(1, cbook2[3]), 246, 215, 368, 451, 269, 277, 309, 402, + 11, AMR_OF(1, pul_il[3]), 246, 215, 368, 451, 269, 277, 309, 402, 423, 435, 471, 7, AMR_OF(1, gain), 4, 21, 43, 29, 33, 39, 25, 4, AMR_OF(1, energy), 76, 77, 78, 79, 9, AMR_OF(2, adap), 15, 16, 17, 18, 19, 51, 70, 96, 108, 1, AMR_OF(2, ltp), 123, - 11, AMR_OF(2, cbook1[0]), 156, 167, 166, 190, 253, 336, 412, 316, + 11, AMR_OF(2, pul_ih[0]), 156, 167, 166, 190, 253, 336, 412, 316, 259, 371, 396, - 11, AMR_OF(2, cbook1[1]), 136, 171, 169, 188, 240, 323, 410, 372, + 11, AMR_OF(2, pul_ih[1]), 136, 171, 169, 188, 240, 323, 410, 372, 274, 388, 344, - 11, AMR_OF(2, cbook1[2]), 140, 172, 170, 214, 262, 381, 407, 340, + 11, AMR_OF(2, pul_ih[2]), 140, 172, 170, 214, 262, 381, 407, 340, 249, 415, 382, - 11, AMR_OF(2, cbook1[3]), 133, 164, 142, 184, 211, 346, 386, 312, + 11, AMR_OF(2, pul_ih[3]), 133, 164, 142, 184, 211, 346, 386, 312, 207, 374, 341, - 11, AMR_OF(2, cbook2[0]), 280, 220, 406, 461, 324, 291, 345, 418, + 11, AMR_OF(2, pul_il[0]), 280, 220, 406, 461, 324, 291, 345, 418, 427, 444, 476, - 11, AMR_OF(2, cbook2[1]), 289, 223, 403, 456, 307, 311, 319, 420, + 11, AMR_OF(2, pul_il[1]), 289, 223, 403, 456, 307, 311, 319, 420, 424, 442, 475, - 11, AMR_OF(2, cbook2[2]), 335, 225, 414, 454, 288, 314, 333, 400, + 11, AMR_OF(2, pul_il[2]), 335, 225, 414, 454, 288, 314, 333, 400, 429, 445, 469, - 11, AMR_OF(2, cbook2[3]), 303, 205, 399, 450, 283, 275, 264, 379, + 11, AMR_OF(2, pul_il[3]), 303, 205, 399, 450, 283, 275, 264, 379, 425, 438, 462, 7, AMR_OF(2, gain), 5, 22, 44, 30, 34, 40, 26, 4, AMR_OF(2, energy), 80, 81, 82, 83, 6, AMR_OF(3, adap), 37, 50, 89, 94, 100, 115, 1, AMR_OF(3, ltp), 124, - 11, AMR_OF(3, cbook1[0]), 135, 168, 152, 179, 226, 302, 347, 299, + 11, AMR_OF(3, pul_ih[0]), 135, 168, 152, 179, 226, 302, 347, 299, 191, 367, 338, - 11, AMR_OF(3, cbook1[1]), 134, 161, 162, 196, 208, 331, 339, 298, + 11, AMR_OF(3, pul_ih[1]), 134, 161, 162, 196, 208, 331, 339, 298, 250, 383, 359, - 11, AMR_OF(3, cbook1[2]), 139, 159, 160, 185, 230, 337, 362, 271, + 11, AMR_OF(3, pul_ih[2]), 139, 159, 160, 185, 230, 337, 362, 271, 209, 385, 348, - 11, AMR_OF(3, cbook1[3]), 130, 151, 146, 180, 221, 315, 387, 326, + 11, AMR_OF(3, pul_ih[3]), 130, 151, 146, 180, 221, 315, 387, 326, 213, 404, 342, - 11, AMR_OF(3, cbook2[0]), 270, 193, 375, 443, 266, 287, 310, 426, + 11, AMR_OF(3, pul_il[0]), 270, 193, 375, 443, 266, 287, 310, 426, 416, 437, 474, - 11, AMR_OF(3, cbook2[1]), 296, 227, 390, 459, 232, 257, 238, 365, + 11, AMR_OF(3, pul_il[1]), 296, 227, 390, 459, 232, 257, 238, 365, 413, 422, 468, - 11, AMR_OF(3, cbook2[2]), 236, 210, 397, 452, 242, 278, 300, 411, + 11, AMR_OF(3, pul_il[2]), 236, 210, 397, 452, 242, 278, 300, 411, 430, 441, 464, - 11, AMR_OF(3, cbook2[3]), 255, 183, 389, 449, 244, 281, 305, 394, + 11, AMR_OF(3, pul_il[3]), 255, 183, 389, 449, 244, 281, 305, 394, 405, 434, 460, 7, AMR_OF(3, gain), 6, 23, 45, 31, 35, 41, 27, 4, AMR_OF(3, energy), 84, 85, 86, 87, ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdata.h | 366 ++++++++++++++++++++++++------------------------ 1 files changed, 183 insertions(+), 183 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

Reminder: upcoming midterm reviews
by Ronald S. Bultje 05 Jul '10

05 Jul '10

Hi guys, next week (7/16) is the deadline for the midterm reviews. Please everyone consult their mentor about specific things that should be finished by midterm, look back at the original schedule you made up at the beginning, make sure you met the deadlines set there, and get you work so far reviewed by mentor and maybe some others. this way we can make sure you get the best midterm reviews possible, and code is up to the quality we expect by the end of the SoC. Happy coding! Ronald

1 0

[soc] G.723.1 Decoder 290a06528d517c7049da4f0d0abf4e849b0d898e
by naufal11＠gmail.com 04 Jul '10

04 Jul '10

- Log ----------------------------------------------------------------- commit 290a06528d517c7049da4f0d0abf4e849b0d898e Author: Naufal <naufal11(a)gmail.com> Date: Mon Jul 5 03:34:05 2010 +0530 Correct calculation diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 69ff704..6bd5051 100755 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -624,7 +624,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int offset = SUBFRAME_LEN * i; comp_ppf_coeff(vector_ptr, p->pitch_lag[i >> 1], ppf + i, p->cur_rate, i); - ff_acelp_weighted_vector_sum(out, vector_ptr + offset, + ff_acelp_weighted_vector_sum(out + offset, vector_ptr + offset, vector_ptr + offset + ppf[i].index, ppf[i].sc_gain, ppf[i].opt_gain, 1 << 15, 16, SUBFRAME_LEN); ----------------------------------------------------------------------- Summary of changes: libavcodec/g723_1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://github.com/naufal/ffmpeg-soc

1 0

[soc] G.723.1 Decoder f196bd6fcf38af4f59036cedac800da076932aa2
by naufal11＠gmail.com 04 Jul '10

04 Jul '10

- Log ----------------------------------------------------------------- commit f196bd6fcf38af4f59036cedac800da076932aa2 Author: Naufal <naufal11(a)gmail.com> Date: Mon Jul 5 03:14:03 2010 +0530 Perform pitch postfiltering diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 9a363bb..c85a1a9 100755 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -142,6 +142,22 @@ static int unpack_bitstream(G723_1_Context *p, const uint8_t *buf, return 0; } +static int normalize_int32(int x) +{ + int i; + int y = x; + if (x) { + if (x == -1) + return INT32_MIN; + if (x < 0) + x = ~x; + for (i = 0; x < 0x40000000; i++) + x <<= 1; + y = av_clipl_int32((int64_t)y << i); + } + return y; +} + /* * Perform inverse quantization of LSP frequencies. * @@ -370,13 +386,190 @@ static void gen_acb_excitation(int16_t *vector, int16_t *prev_excitation, } } +/* + * Search for pitch postfilter forward/backward lag + * and compute cross-correlation. + * + * @param buf decoded excitation + * @param ccr cross-correlation + * @param dir forward(1) or backward(-1) + */ +static int16_t get_ppf_lag(int16_t *buf, int *ccr, int16_t pitch_lag, int index, + int dir) +{ + int temp1, temp2, i, j; + int offset = SUBFRAME_LEN * index; + int lag = 0; + + pitch_lag = FFMIN(PITCH_MAX - 3, pitch_lag); + + for (i = pitch_lag - 3; i <= pitch_lag + 3; i++) { + temp1 = 0; + for (j = 0; j < SUBFRAME_LEN; j++) { + temp2 = av_clipl_int32((int64_t)buf[offset + j] * + buf[offset + j + dir * i] << 1); + temp1 = av_clipl_int32(temp1 + temp2); + + if (temp1 > *ccr) { + *ccr = temp1; + lag = i; + } + } + } + return lag; +} + +/* + * Calculate pitch postfilter optimal and scaling gains. + * + * @param lag pitch postfilter forward/backward lag + * @param ppf pitch postfilter parameters + * @param tgt_eng target energy + * @param ccr cross-correlation + * @param res_eng residual energy + */ +static void comp_ppf_gains(int16_t lag, PPFParam *ppf, Rate cur_rate, + int tgt_eng, int ccr, int res_eng) +{ + int pf_residual; // square of postfiltered residual + int64_t temp1, temp2; + + ppf->index = lag; + + temp1 = tgt_eng * res_eng >> 1; + temp2 = av_clipl_int32((int64_t)ccr * ccr << 1); + + if (temp2 > temp1) { + if (ccr >= res_eng) { + ppf->opt_gain = ppf_gain_weight[cur_rate]; + } else { + ppf->opt_gain = av_clip_int16(ccr * (1 << 15) / res_eng); + ppf->opt_gain = av_clip_int16(ppf->opt_gain * + ppf_gain_weight[cur_rate]); + } + // pf_res^2 = tgt_eng + 2*ccr*gain + res_eng*gain^2 + temp1 = tgt_eng << 15; + temp2 = av_clipl_int32((int64_t)ccr * ppf->opt_gain << 1); + pf_residual = av_clipl_int32(temp1 + temp2); + temp1 = av_clip_int16(ppf->opt_gain * ppf->opt_gain); + temp2 = av_clipl_int32(temp1 * res_eng); + pf_residual = av_clipl_int32(pf_residual + temp2 + (1 << 15)); + + temp1 = tgt_eng << 15; + temp2 = pf_residual & 0xffff0000; + + if (temp1 >= temp2) { + temp1 = 0x7fff; + } else { + temp1 = av_clip_int16((int64_t)temp1 * (1 << 15) / + (temp2 << 16)); + } + + //scaling_gain = sqrt(tgt_eng/pf_res^2) + ppf->sc_gain = ff_sqrt(temp1 << 15); + } else { + ppf->opt_gain = 0; + ppf->sc_gain = 0x7fff; + } + + ppf->opt_gain = av_clip_int16(ppf->opt_gain * ppf->opt_gain); +} + +/* + * Calculate pitch postfilter parameters. + * + * @param buf decoded excitation + * @param ppf pitch postfilter parameters + * @param index current subframe index + */ +static void comp_ppf_coeff(int16_t *buf, int16_t pitch_lag, PPFParam *ppf, + Rate cur_rate, int index) +{ + /* + * 0 - target energy + * 1 - forward cross-correlation + * 2 - forward residual energy + * 3 - backward cross-correlation + * 4 - backward residual energy + */ + int energy[5] = {0, 0, 0, 0, 0}; + + int16_t fwd_lag = get_ppf_lag(buf, &energy[1], pitch_lag, index, -1); + int16_t back_lag = get_ppf_lag(buf, &energy[3], pitch_lag, index, 1); + + int offset = SUBFRAME_LEN * index; + int i; + int64_t temp1, temp2; + + ppf->index = 0; + ppf->opt_gain = 0; + ppf->sc_gain = 0x7fff; + + // Case 0, Section 3.6 + if (!back_lag && !fwd_lag) + return; + + // Compute target energy + for (i = 0; i < SUBFRAME_LEN; i++) { + temp1 = av_clipl_int32((int64_t)buf[offset + i] * + buf[offset + i] << 1); + energy[0] = av_clipl_int32(energy[0] + temp1); + } + + // Compute forward residual energy + if (fwd_lag) { + for (i = 0; i < SUBFRAME_LEN; i++) { + temp1 = av_clipl_int32((int64_t)buf[offset + fwd_lag + i] * + buf[offset + fwd_lag + i] << 1); + energy[2] = av_clipl_int32(energy[2] + temp1); + } + } + + // Compute backward residual energy + if (back_lag) { + for (i = 0; i < SUBFRAME_LEN; i++) { + temp1 = av_clipl_int32((int64_t)buf[offset - back_lag + i] * + buf[offset - back_lag + i] << 1); + energy[4] = av_clipl_int32(energy[4] + temp1); + } + } + + for (i = 0; i < 5; i++) + energy[i] = normalize_int32(energy[i]) >> 16; + + if (fwd_lag && !back_lag) { // Case 1 + comp_ppf_gains(fwd_lag, ppf, cur_rate, energy[0], energy[1], + energy[2]); + } else if (!fwd_lag) { // Case 2 + comp_ppf_gains(back_lag, ppf, cur_rate, energy[0], energy[3], + energy[4]); + } else { // Case 3 + + // Select the largest of energy[1]^2/energy[2] and energy[3]^2/energy[4] + temp1 = av_clip_int16((energy[1] * energy[1] + (1 << 14)) >> 15); + temp1 = av_clipl_int32(temp1 * energy[4]); + temp2 = av_clip_int16((energy[3] * energy[3] + (1 << 14)) >> 15); + temp2 = av_clipl_int32(temp2 * energy[2]); + + if (temp1 >= temp2) { + comp_ppf_gains(fwd_lag, ppf, cur_rate, energy[0], energy[1], + energy[2]); + } else { + comp_ppf_gains(back_lag, ppf, cur_rate, energy[0], energy[3], + energy[4]); + } + } +} + static int g723_1_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { G723_1_Context *p = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; + int16_t *out = data; + PPFParam ppf[SUBFRAMES]; int16_t cur_lsp[LPC_ORDER]; int16_t lpc[SUBFRAMES * LPC_ORDER + 4]; int16_t temp_vector[FRAME_LEN + PITCH_MAX]; @@ -425,6 +618,17 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, } vector_ptr += SUBFRAME_LEN; } + // Perform pitch postfiltering + vector_ptr = temp_vector + PITCH_MAX; + for (i = 0; i < SUBFRAMES; i++) { + int offset = SUBFRAME_LEN * i; + comp_ppf_coeff(vector_ptr, p->pitch_lag[i >> 1], + ppf + i, p->cur_rate, i); + ff_acelp_weighted_vector_sum(out, vector_ptr + offset, + vector_ptr + offset + ppf[i].index, + ppf[i].sc_gain, ppf[i].opt_gain, + 1 << 15, 16, SUBFRAME_LEN); + } } } diff --git a/libavcodec/g723_1_data.h b/libavcodec/g723_1_data.h index fc20054..6e93d6c 100644 --- a/libavcodec/g723_1_data.h +++ b/libavcodec/g723_1_data.h @@ -41,6 +41,20 @@ typedef struct { } G723_1_Subframe; /* + * Pitch postfilter parameters + */ +typedef struct { + int16_t index; ///< postfilter backward/forward lag + int16_t opt_gain; ///< optimal gain + int16_t sc_gain; ///< scaling gain +} PPFParam; + +/* + * Postfilter gain weighting factors scaled by 2^15 + */ +static const int16_t ppf_gain_weight[2] = {0x1800, 0x2000}; + +/* * LSP DC component */ static const int16_t dc_lsp[LPC_ORDER] = { ----------------------------------------------------------------------- Summary of changes: libavcodec/g723_1.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/g723_1_data.h | 14 +++ 2 files changed, 218 insertions(+), 0 deletions(-) -- http://github.com/naufal/ffmpeg-soc

1 0

[soc]: r5848 - in libavfilter: diffs/03_doc_filters.diff vf_drawtext.c
by stefano 04 Jul '10

04 Jul '10

Author: stefano Date: Sun Jul 4 21:08:10 2010 New Revision: 5848 Log: Allow the drawtext filter to set opacity through an alpha specifier in the color string. Modified: libavfilter/diffs/03_doc_filters.diff libavfilter/vf_drawtext.c Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Sun Jul 4 20:39:41 2010 (r5847) +++ libavfilter/diffs/03_doc_filters.diff Sun Jul 4 21:08:10 2010 (r5848) @@ -2,7 +2,7 @@ Index: doc/filters.texi =================================================================== --- doc/filters.texi (revision 24040) +++ doc/filters.texi (working copy) -@@ -39,6 +39,111 @@ +@@ -39,6 +39,114 @@ The default value of @var{width} and @var{height} is 0. @@ -66,7 +66,8 @@ Index: doc/filters.texi +@item fgcolor + +The foreground color to be used for drawing text. -+Either a string (e.g. ``red'') or in 0xRRGGBB[AA] format (e.g. ``0xff000033''). ++Either a string (e.g. ``red'') or in 0xRRGGBB[AA] format ++(e.g. ``0xff000033''), possibly followed by an alpha specifier. + +The default value of @var{fgcolor} is black. + @@ -74,7 +75,8 @@ Index: doc/filters.texi + +The background color to be used for drawing box around text or drawing +text outline based on option selected. -+Either a string (e.g. ``yellow'') or in 0xRRGGBB[AA] format (e.g. ``0xff00ff''). ++Either a string (e.g. ``yellow'') or in 0xRRGGBB[AA] format ++(e.g. ``0xff00ff''), possibly followed by an alpha specifier. + +The default value of @var{bgcolor} is white. + @@ -96,11 +98,12 @@ Index: doc/filters.texi + +@example +drawtext="fontfile=FreeSerif.ttf: text='Test Text': x=100: y=50: fontsize=24: -+ fgcolor=0xff00ff33: bgcolor=red: box=1" ++ fgcolor=yellow@@0.2: bgcolor=red@@0.2: box=1" +@end example + +Draw 'Test Text' with font FreeSerif of size 24 at (100,50), text color is yellow, -+background color is red, draw a box around text. ++background color is red, draw a box around text. Both the text and the ++box have an opacity of 20%. + +Note that the double quotes are not necessary if spaces are not used within +the parameter list. @@ -114,7 +117,7 @@ Index: doc/filters.texi @section format Convert the input video to one of the specified pixel formats. -@@ -56,6 +161,30 @@ +@@ -56,6 +164,30 @@ will convert the input video to the format ``yuv420p''. @@ -145,7 +148,7 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -77,6 +206,56 @@ +@@ -77,6 +209,56 @@ Pass the source unchanged to the output. @@ -202,7 +205,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -112,6 +291,14 @@ +@@ -112,6 +294,14 @@ @end table @@ -217,7 +220,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -137,6 +324,24 @@ +@@ -137,6 +327,24 @@ The default value of @var{width} and @var{height} is 0. @@ -242,7 +245,7 @@ Index: doc/filters.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -152,6 +357,19 @@ +@@ -152,6 +360,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -262,7 +265,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -217,6 +435,32 @@ +@@ -217,6 +438,32 @@ Below is a description of the currently available video sources. Modified: libavfilter/vf_drawtext.c ============================================================================== --- libavfilter/vf_drawtext.c Sun Jul 4 20:39:41 2010 (r5847) +++ libavfilter/vf_drawtext.c Sun Jul 4 21:08:10 2010 (r5848) @@ -133,14 +133,8 @@ static inline int extract_color(AVFilter color[0] = RGB_TO_Y(rgba[0], rgba[1], rgba[2]); color[1] = RGB_TO_U(rgba[0], rgba[1], rgba[2], 0); color[2] = RGB_TO_V(rgba[0], rgba[1], rgba[2], 0); + color[3] = rgba[3]; - /* FIXME: av_parse_color currently sets alpha to 0 if no alpha is specified. - * So we force alpha = 0xFF (opaque), here in such a case. - */ - if (rgba[3] != 0) - color[3] = rgba[3]; - else - color[3] = 0xFF; return 0; }

1 0

[soc]: r5847 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/03_doc_filters.diff vf_drawbox.c vf_drawtext.c
by stefano 04 Jul '10

04 Jul '10

Author: stefano Date: Sun Jul 4 20:39:41 2010 New Revision: 5847 Log: Update to FFmpeg r24040 / libswscale r31628. Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/03_doc_filters.diff libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Thu Jul 1 01:27:39 2010 (r5846) +++ libavfilter/checkout.sh Sun Jul 4 20:39:41 2010 (r5847) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r23745 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24040 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r31301 +svn up -r31628 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Thu Jul 1 01:27:39 2010 (r5846) +++ libavfilter/diffs/00_configure.diff Sun Jul 4 20:39:41 2010 (r5847) @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 23745) +--- configure (revision 24040) +++ configure (working copy) @@ -167,6 +167,7 @@ and libraw1394 [no] @@ -10,7 +10,7 @@ Index: configure --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] --enable-libnut enable NUT (de)muxing via libnut, -@@ -911,6 +912,7 @@ +@@ -860,6 +861,7 @@ libdc1394 libdirac libfaac @@ -18,7 +18,7 @@ Index: configure libgsm libmp3lame libnut -@@ -1050,6 +1052,7 @@ +@@ -1001,6 +1003,7 @@ llrintf local_aligned_16 local_aligned_8 @@ -26,7 +26,7 @@ Index: configure log2 log2f loongson -@@ -1412,6 +1415,7 @@ +@@ -1369,6 +1372,7 @@ udp_protocol_deps="network" # filters @@ -34,7 +34,7 @@ Index: configure movie_filter_deps="avfilter_lavf" avfilter_lavf_deps="avformat" -@@ -2486,6 +2490,7 @@ +@@ -2461,6 +2465,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -42,11 +42,11 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2568,6 +2573,7 @@ +@@ -2543,6 +2548,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +enabled libfreetype && add_cflags $(pkg-config --cflags freetype2) && require libfreetype ft2build.h FT_Init_FreeType -lfreetype -lz enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm - enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame -lm + enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame enabled libnut && require libnut libnut.h nut_demuxer_init -lnut Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Thu Jul 1 01:27:39 2010 (r5846) +++ libavfilter/diffs/03_doc_filters.diff Sun Jul 4 20:39:41 2010 (r5847) @@ -1,6 +1,6 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 23745) +--- doc/filters.texi (revision 24040) +++ doc/filters.texi (working copy) @@ -39,6 +39,111 @@ Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c Thu Jul 1 01:27:39 2010 (r5846) +++ libavfilter/vf_drawbox.c Sun Jul 4 20:39:41 2010 (r5847) @@ -27,7 +27,7 @@ #include "avfilter.h" #include "parseutils.h" -#include "libavcodec/colorspace.h" +#include "libavutil/colorspace.h" typedef struct { Modified: libavfilter/vf_drawtext.c ============================================================================== --- libavfilter/vf_drawtext.c Thu Jul 1 01:27:39 2010 (r5846) +++ libavfilter/vf_drawtext.c Sun Jul 4 20:39:41 2010 (r5847) @@ -27,7 +27,7 @@ #include "avfilter.h" #include "parseutils.h" -#include "libavcodec/colorspace.h" +#include "libavutil/colorspace.h" #include "libavutil/pixdesc.h" #undef time

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 03 Jul '10

03 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via 222bb38d248bd57851851fa54e41b749eb1081e0 (commit) from ae42363624c0c0379bd2dc754801bdec55eb216e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 222bb38d248bd57851851fa54e41b749eb1081e0 Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Fri Jul 2 21:58:51 2010 -0300 Finish decoding of the adaptive codebook diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 827b0d5..8cd0925 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -52,6 +52,8 @@ static int amrwb_decode_init(AVCodecContext *avctx) { AMRWBContext *ctx = avctx->priv_data; int i; + + ctx->excitation = &ctx->excitation_buf[PITCH_MAX + LP_ORDER + 1]; for (i = 0; i < LP_ORDER; i++) { ctx->isf_q_past[i] = isf_init[i] / (float) (1 << 15); @@ -379,6 +381,8 @@ static void decode_pitch_vector(AMRWBContext *ctx, const int subframe) { int pitch_lag_int, pitch_lag_frac; + int i; + float *exc = ctx->excitation; enum Mode mode = ctx->fr_cur_mode; if (mode == MODE_6k60) { @@ -395,12 +399,18 @@ static void decode_pitch_vector(AMRWBContext *ctx, /* Calculate the pitch vector by interpolating the past excitation at the pitch lag using a hamming windowed sinc function. */ - ff_acelp_interpolatef(ctx->excitation, ctx->excitation + 1 - pitch_lag_int, + ff_acelp_interpolatef(exc, exc + 1 - pitch_lag_int, ac_inter, 4, pitch_lag_frac + 4 - 4*(pitch_lag_frac > 0), LP_ORDER, AMRWB_SUBFRAME_SIZE); - memcpy(ctx->pitch_vector, ctx->excitation, AMRWB_SUBFRAME_SIZE * sizeof(float)); + /* Check which pitch signal path should be used */ + if (amr_subframe->ltp) { + memcpy(ctx->pitch_vector, exc, AMRWB_SUBFRAME_SIZE * sizeof(float)); + } else { + for (i = 0; i < AMRWB_SUBFRAME_SIZE; i++) + ctx->pitch_vector[i] = 0.18 * exc[i - 1] + 0.64 * exc[i] + 0.18 * exc[i + 1]; + } } static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, @@ -452,11 +462,6 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, return 0; } -static int amrwb_decode_close(AVCodecContext *avctx) -{ - return 0; -} - AVCodec amrwb_decoder = { .name = "amrwb", @@ -464,7 +469,6 @@ AVCodec amrwb_decoder = .id = CODEC_ID_AMR_WB, .priv_data_size = sizeof(AMRWBContext), .init = amrwb_decode_init, - .close = amrwb_decode_close, .decode = amrwb_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"), }; ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdec.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

[soc]AMR-WB decoder branch, master, updated.
by Marcelo Póvoa 02 Jul '10

02 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "AMR-WB decoder". The branch, master has been updated via ae42363624c0c0379bd2dc754801bdec55eb216e (commit) from 18bd5b400745788b6f7bc40dafc0c2c1d9ebdc28 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ae42363624c0c0379bd2dc754801bdec55eb216e Author: Marcelo Povoa <marspeoplester(a)gmail.com> Date: Fri Jul 2 17:45:40 2010 -0300 Calculate first adaptive codebook vector (v1) diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 35e3060..5e4f62e 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -24,9 +24,12 @@ #include <stdint.h> -#define LP_ORDER 16 ///< linear predictive coding filter order -#define MIN_ISF_SPACING 50.0 /* Taken from fixed-point 26.173, not sure */ -#define PRED_FACTOR (1.0/3.0) +#define LP_ORDER 16 ///< linear predictive coding filter order +#define MIN_ISF_SPACING 50.0 /* Taken from fixed-point 26.173, not sure */ +#define PRED_FACTOR (1.0/3.0) + +#define AMRWB_SUBFRAME_SIZE 64 ///< samples per subframe +#define PITCH_MAX 231 ///< maximum received pitch delay value /* Mode ordering is sensitive, do not change */ enum Mode { @@ -1597,6 +1600,28 @@ static const int16_t isp_init[LP_ORDER] = { -6393, -12540, -18205, -23170, -27246, -30274, -32138, 1475 }; +/* Coefficients for FIR interpolation of excitation vector + * at pitch lag resulting the adaptive codebook vector */ +static const float ac_inter[65] = { + 0.940000, + 0.856390, 0.632268, 0.337560, 0.059072, + -0.131059, -0.199393, -0.158569, -0.056359, + 0.047606, 0.106749, 0.103705, 0.052062, + -0.015182, -0.063705, -0.073660, -0.046497, + -0.000983, 0.038227, 0.053143, 0.040059, + 0.009308, -0.021674, -0.037767, -0.033186, + -0.013028, 0.010702, 0.025901, 0.026318, + 0.013821, -0.003645, -0.016813, -0.019855, + -0.012766, -0.000530, 0.010080, 0.014122, + 0.010657, 0.002594, -0.005363, -0.009344, + -0.008101, -0.003182, 0.002330, 0.005635, + 0.005562, 0.002844, -0.000627, -0.002993, + -0.003362, -0.002044, -0.000116, 0.001315, + 0.001692, 0.001151, 0.000259, -0.000417, + -0.000618, -0.000434, -0.000133, 0.000063, + 0.000098, 0.000048, 0.000007, 0.000000 +}; + /* Core frame sizes in each mode */ static const uint16_t cf_sizes_wb[] = { 132, 177, 253, 285, 317, 365, 397, 461, 477, diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 68a5d91..827b0d5 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -22,24 +22,30 @@ #include "avcodec.h" #include "get_bits.h" #include "lsp.h" +#include "acelp_filters.h" #include "amrwbdata.h" typedef struct { - AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream - enum Mode fr_cur_mode; ///< mode index of current frame - uint8_t fr_quality; ///< frame quality index (FQI) - uint8_t fr_mode_ind; ///< mode indication field - uint8_t fr_mode_req; ///< mode request field - uint8_t fr_crc; ///< crc for class A bits - float isf_quant[LP_ORDER]; ///< quantized ISF vector from current frame - float isf_q_past[LP_ORDER]; ///< quantized ISF vector of the previous frame - double isp[4][LP_ORDER]; ///< ISP vectors from current frame - double isp_sub4_past[LP_ORDER]; ///< ISP vector for the 4th subframe of the previous frame + AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream + enum Mode fr_cur_mode; ///< mode index of current frame + uint8_t fr_quality; ///< frame quality index (FQI) + uint8_t fr_mode_ind; ///< mode indication field + uint8_t fr_mode_req; ///< mode request field + uint8_t fr_crc; ///< crc for class A bits + float isf_quant[LP_ORDER]; ///< quantized ISF vector from current frame + float isf_q_past[LP_ORDER]; ///< quantized ISF vector of the previous frame + double isp[4][LP_ORDER]; ///< ISP vectors from current frame + double isp_sub4_past[LP_ORDER]; ///< ISP vector for the 4th subframe of the previous frame - float lp_coef[4][LP_ORDER]; ///< Linear Prediction Coefficients from ISP vector + float lp_coef[4][LP_ORDER]; ///< Linear Prediction Coefficients from ISP vector - uint8_t base_pitch_lag; ///< integer part of pitch lag for next relative subframe + uint8_t base_pitch_lag; ///< integer part of pitch lag for next relative subframe + + float excitation_buf[PITCH_MAX + LP_ORDER + 1 + AMRWB_SUBFRAME_SIZE]; ///< current excitation and all necessary excitation history + float *excitation; ///< points to current excitation in excitation_buf[] + + float pitch_vector[AMRWB_SUBFRAME_SIZE]; ///< adaptive codebook (pitch) vector for current subframe } AMRWBContext; static int amrwb_decode_init(AVCodecContext *avctx) @@ -288,7 +294,7 @@ static void isp2lp(double isp[LP_ORDER], float *lp, int lp_half_order) { /** * Decode a adaptive codebook index into pitch lag (except 6k60, 8k85 modes) - * Calculate (nearest) integer lag and fractional lag using 1/4 resolution + * Calculate (nearest) integer lag and fractional lag always using 1/4 resolution * In 1st and 3rd subframes index is relative to last subframe integer lag * * @param lag_int [out] Decoded integer pitch lag @@ -384,6 +390,17 @@ static void decode_pitch_vector(AMRWBContext *ctx, } else decode_pitch_lag_high(&pitch_lag_int, &pitch_lag_frac, amr_subframe->adap, &ctx->base_pitch_lag, subframe); + + pitch_lag_int += pitch_lag_frac > 0; + + /* Calculate the pitch vector by interpolating the past excitation at the + pitch lag using a hamming windowed sinc function. */ + ff_acelp_interpolatef(ctx->excitation, ctx->excitation + 1 - pitch_lag_int, + ac_inter, 4, + pitch_lag_frac + 4 - 4*(pitch_lag_frac > 0), + LP_ORDER, AMRWB_SUBFRAME_SIZE); + + memcpy(ctx->pitch_vector, ctx->excitation, AMRWB_SUBFRAME_SIZE * sizeof(float)); } static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ----------------------------------------------------------------------- Summary of changes: libavcodec/amrwbdata.h | 31 ++++++++++++++++++++++++++++--- libavcodec/amrwbdec.c | 43 ++++++++++++++++++++++++++++++------------- 2 files changed, 58 insertions(+), 16 deletions(-) hooks/post-receive -- AMR-WB decoder

1 0

SVQ3 depacketizer
by Josh Allmann 01 Jul '10

01 Jul '10

Hi guys, Here is the depacketizer for SVQ3 that Ronald wrote some time ago. To test, you'll need to disable audio until we get QDM2 merged -- thanks Martin for the tip. (s1->skip_media = 1; return; in line 272 of rtsp.c, and add "-an" to your ffmpeg/ffplay parameters). I also updated the Changelog entry with a reference to RTSP-HTTP. Josh

5 18