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

Side by Side Diff: src/libFLAC/include/protected/stream_decoder.h

Issue 1961133002: Update FLAC to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/flac.git@master
Patch Set: build config tweaks for Windows Created 4 years, 7 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
« no previous file with comments | « src/libFLAC/include/protected/all.h ('k') | src/libFLAC/include/protected/stream_encoder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* libFLAC - Free Lossless Audio Codec library 1 /* libFLAC - Free Lossless Audio Codec library
2 * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson 2 * Copyright (C) 2000-2009 Josh Coalson
3 * Copyright (C) 2011-2014 Xiph.Org Foundation
3 * 4 *
4 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
6 * are met: 7 * are met:
7 * 8 *
8 * - Redistributions of source code must retain the above copyright 9 * - Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
10 * 11 *
11 * - Redistributions in binary form must reproduce the above copyright 12 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
32 #ifndef FLAC__PROTECTED__STREAM_DECODER_H 33 #ifndef FLAC__PROTECTED__STREAM_DECODER_H
33 #define FLAC__PROTECTED__STREAM_DECODER_H 34 #define FLAC__PROTECTED__STREAM_DECODER_H
34 35
35 #include "FLAC/stream_decoder.h" 36 #include "FLAC/stream_decoder.h"
36 #if FLAC__HAS_OGG 37 #if FLAC__HAS_OGG
37 #include "private/ogg_decoder_aspect.h" 38 #include "private/ogg_decoder_aspect.h"
38 #endif 39 #endif
39 40
40 typedef struct FLAC__StreamDecoderProtected { 41 typedef struct FLAC__StreamDecoderProtected {
41 FLAC__StreamDecoderState state; 42 FLAC__StreamDecoderState state;
43 FLAC__StreamDecoderInitStatus initstate;
42 unsigned channels; 44 unsigned channels;
43 FLAC__ChannelAssignment channel_assignment; 45 FLAC__ChannelAssignment channel_assignment;
44 unsigned bits_per_sample; 46 unsigned bits_per_sample;
45 unsigned sample_rate; /* in Hz */ 47 unsigned sample_rate; /* in Hz */
46 unsigned blocksize; /* in samples (per channel) */ 48 unsigned blocksize; /* in samples (per channel) */
47 FLAC__bool md5_checking; /* if true, generate MD5 signature of decoded d ata and compare against signature in the STREAMINFO metadata block */ 49 FLAC__bool md5_checking; /* if true, generate MD5 signature of decoded d ata and compare against signature in the STREAMINFO metadata block */
48 #if FLAC__HAS_OGG 50 #if FLAC__HAS_OGG
49 FLAC__OggDecoderAspect ogg_decoder_aspect; 51 FLAC__OggDecoderAspect ogg_decoder_aspect;
50 #endif 52 #endif
51 } FLAC__StreamDecoderProtected; 53 } FLAC__StreamDecoderProtected;
52 54
53 /* 55 /*
54 * return the number of input bytes consumed 56 * return the number of input bytes consumed
55 */ 57 */
56 unsigned FLAC__stream_decoder_get_input_bytes_unconsumed(const FLAC__StreamDecod er *decoder); 58 unsigned FLAC__stream_decoder_get_input_bytes_unconsumed(const FLAC__StreamDecod er *decoder);
57 59
58 #endif 60 #endif
OLDNEW
« no previous file with comments | « src/libFLAC/include/protected/all.h ('k') | src/libFLAC/include/protected/stream_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698