Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1053)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/vc1dsp.c ('k') | source/patched-ffmpeg-mt/libavcodec/vp3.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /** 1 /**
2 * @file 2 * @file
3 * Vorbis I decoder 3 * Vorbis I decoder
4 * @author Denes Balatoni ( dbalatoni programozo hu ) 4 * @author Denes Balatoni ( dbalatoni programozo hu )
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 // Process floors part 460 // Process floors part
461 461
462 static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc, 462 static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc,
463 vorbis_floor_data *vfu, float *vec); 463 vorbis_floor_data *vfu, float *vec);
464 static void create_map(vorbis_context *vc, uint_fast8_t floor_number); 464 static void create_map(vorbis_context *vc, uint_fast8_t floor_number);
465 static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, 465 static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc,
466 vorbis_floor_data *vfu, float *vec); 466 vorbis_floor_data *vfu, float *vec);
467 static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 467 static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
468 { 468 {
469 GetBitContext *gb = &vc->gb; 469 GetBitContext *gb = &vc->gb;
470 uint_fast16_t i,j,k; 470 int i,j,k;
471 471
472 vc->floor_count = get_bits(gb, 6) + 1; 472 vc->floor_count = get_bits(gb, 6) + 1;
473 473
474 vc->floors = av_mallocz(vc->floor_count * sizeof(vorbis_floor)); 474 vc->floors = av_mallocz(vc->floor_count * sizeof(vorbis_floor));
475 475
476 for (i = 0; i < vc->floor_count; ++i) { 476 for (i = 0; i < vc->floor_count; ++i) {
477 vorbis_floor *floor_setup = &vc->floors[i]; 477 vorbis_floor *floor_setup = &vc->floors[i];
478 478
479 floor_setup->floor_type = get_bits(gb, 16); 479 floor_setup->floor_type = get_bits(gb, 16);
480 480
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 CODEC_ID_VORBIS, 1664 CODEC_ID_VORBIS,
1665 sizeof(vorbis_context), 1665 sizeof(vorbis_context),
1666 vorbis_decode_init, 1666 vorbis_decode_init,
1667 NULL, 1667 NULL,
1668 vorbis_decode_close, 1668 vorbis_decode_close,
1669 vorbis_decode_frame, 1669 vorbis_decode_frame,
1670 .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), 1670 .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
1671 .channel_layouts = ff_vorbis_channel_layouts, 1671 .channel_layouts = ff_vorbis_channel_layouts,
1672 }; 1672 };
1673 1673
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/vc1dsp.c ('k') | source/patched-ffmpeg-mt/libavcodec/vp3.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698