diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-19 14:55:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-19 14:55:58 +0200 |
| commit | c9fe864472a2c55c7c4189ff6fb490bec8bd92b3 (patch) | |
| tree | e6b713039096a079b01f66237e8516bdee893f2d /libavcodec | |
| parent | 5980e57cf9a08ca284bc1b5ffba2363f9eff8ca8 (diff) | |
| parent | 4855022aa11ec7aa1a3bd9797814e84795634abe (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vorbisdec: remove some pointless comments
avprobe: add const to AVCodec pointer
libavformat: add const to AVCodec pointers
pthread: add const to AVCodec pointers
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread.c | 8 | ||||
| -rw-r--r-- | libavcodec/vorbisdec.c | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index d7ff5f6dec..5123d1da27 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -364,7 +364,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg) PerThreadContext *p = arg; FrameThreadContext *fctx = p->parent; AVCodecContext *avctx = p->avctx; - AVCodec *codec = avctx->codec; + const AVCodec *codec = avctx->codec; pthread_mutex_lock(&p->mutex); while (1) { @@ -528,7 +528,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt) { FrameThreadContext *fctx = p->parent; PerThreadContext *prev_thread = fctx->prev_thread; - AVCodec *codec = p->avctx->codec; + const AVCodec *codec = p->avctx->codec; uint8_t *buf = p->avpkt.data; if (!avpkt->size && !(codec->capabilities & CODEC_CAP_DELAY)) return 0; @@ -736,7 +736,7 @@ static void park_frame_worker_threads(FrameThreadContext *fctx, int thread_count static void frame_thread_free(AVCodecContext *avctx, int thread_count) { FrameThreadContext *fctx = avctx->thread_opaque; - AVCodec *codec = avctx->codec; + const AVCodec *codec = avctx->codec; int i; park_frame_worker_threads(fctx, thread_count); @@ -794,7 +794,7 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count) static int frame_thread_init(AVCodecContext *avctx) { int thread_count = avctx->thread_count; - AVCodec *codec = avctx->codec; + const AVCodec *codec = avctx->codec; AVCodecContext *src = avctx; FrameThreadContext *fctx; int i, err = 0; diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index f83355f8db..d0709331e5 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1366,14 +1366,14 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, for (k = 0; k < step; ++k) { coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; for (l = 0; l < dim; ++l) - vec[voffs + k + l * step] += codebook.codevectors[coffs + l]; // FPMATH + vec[voffs + k + l * step] += codebook.codevectors[coffs + l]; } } else if (vr_type == 1) { voffs = voffset + j * vlen; for (k = 0; k < step; ++k) { coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; for (l = 0; l < dim; ++l, ++voffs) { - vec[voffs]+=codebook.codevectors[coffs+l]; // FPMATH + vec[voffs]+=codebook.codevectors[coffs+l]; av_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d \n", pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs); @@ -1385,23 +1385,23 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, if (dim == 2) { for (k = 0; k < step; ++k) { coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * 2; - vec[voffs + k ] += codebook.codevectors[coffs ]; // FPMATH - vec[voffs + k + vlen] += codebook.codevectors[coffs + 1]; // FPMATH + vec[voffs + k ] += codebook.codevectors[coffs ]; + vec[voffs + k + vlen] += codebook.codevectors[coffs + 1]; } } else if (dim == 4) { for (k = 0; k < step; ++k, voffs += 2) { coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * 4; - vec[voffs ] += codebook.codevectors[coffs ]; // FPMATH - vec[voffs + 1 ] += codebook.codevectors[coffs + 2]; // FPMATH - vec[voffs + vlen ] += codebook.codevectors[coffs + 1]; // FPMATH - vec[voffs + vlen + 1] += codebook.codevectors[coffs + 3]; // FPMATH + vec[voffs ] += codebook.codevectors[coffs ]; + vec[voffs + 1 ] += codebook.codevectors[coffs + 2]; + vec[voffs + vlen ] += codebook.codevectors[coffs + 1]; + vec[voffs + vlen + 1] += codebook.codevectors[coffs + 3]; } } else for (k = 0; k < step; ++k) { coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; for (l = 0; l < dim; l += 2, voffs++) { - vec[voffs ] += codebook.codevectors[coffs + l ]; // FPMATH - vec[voffs + vlen] += codebook.codevectors[coffs + l + 1]; // FPMATH + vec[voffs ] += codebook.codevectors[coffs + l ]; + vec[voffs + vlen] += codebook.codevectors[coffs + l + 1]; av_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset / ch + (voffs % ch) * vlen, @@ -1621,7 +1621,7 @@ static int vorbis_parse_audio_packet(vorbis_context *vc) mdct->imdct_half(mdct, ch_res_ptr, ch_floor_ptr); } -// Overlap/add, save data for next overlapping FPMATH +// Overlap/add, save data for next overlapping retlen = (blocksize + vc->blocksize[previous_window]) / 4; for (j = 0; j < vc->audio_channels; j++) { |