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

Side by Side Diff: include/FLAC/format.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 | « include/FLAC/export.h ('k') | include/FLAC/metadata.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 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 502
502 FLAC__METADATA_TYPE_VORBIS_COMMENT = 4, 503 FLAC__METADATA_TYPE_VORBIS_COMMENT = 4,
503 /**< <A HREF="../format.html#metadata_block_vorbis_comment">VORBISCOMMEN T</A> block (a.k.a. FLAC tags) */ 504 /**< <A HREF="../format.html#metadata_block_vorbis_comment">VORBISCOMMEN T</A> block (a.k.a. FLAC tags) */
504 505
505 FLAC__METADATA_TYPE_CUESHEET = 5, 506 FLAC__METADATA_TYPE_CUESHEET = 5,
506 /**< <A HREF="../format.html#metadata_block_cuesheet">CUESHEET</A> block */ 507 /**< <A HREF="../format.html#metadata_block_cuesheet">CUESHEET</A> block */
507 508
508 FLAC__METADATA_TYPE_PICTURE = 6, 509 FLAC__METADATA_TYPE_PICTURE = 6,
509 /**< <A HREF="../format.html#metadata_block_picture">PICTURE</A> block * / 510 /**< <A HREF="../format.html#metadata_block_picture">PICTURE</A> block * /
510 511
511 » FLAC__METADATA_TYPE_UNDEFINED = 7 512 » FLAC__METADATA_TYPE_UNDEFINED = 7,
512 /**< marker to denote beginning of undefined type range; this number wil l increase as new metadata types are added */ 513 /**< marker to denote beginning of undefined type range; this number wil l increase as new metadata types are added */
513 514
515 FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE,
516 /**< No type will ever be greater than this. There is not enough room in the protocol block. */
514 } FLAC__MetadataType; 517 } FLAC__MetadataType;
515 518
516 /** Maps a FLAC__MetadataType to a C string. 519 /** Maps a FLAC__MetadataType to a C string.
517 * 520 *
518 * Using a FLAC__MetadataType as the index to this array will 521 * Using a FLAC__MetadataType as the index to this array will
519 * give the string equivalent. The contents should not be modified. 522 * give the string equivalent. The contents should not be modified.
520 */ 523 */
521 extern FLAC_API const char * const FLAC__MetadataTypeString[]; 524 extern FLAC_API const char * const FLAC__MetadataTypeString[];
522 525
523 526
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 875
873 /** Tests that a sample rate is valid for FLAC. 876 /** Tests that a sample rate is valid for FLAC.
874 * 877 *
875 * \param sample_rate The sample rate to test for compliance. 878 * \param sample_rate The sample rate to test for compliance.
876 * \retval FLAC__bool 879 * \retval FLAC__bool
877 * \c true if the given sample rate conforms to the specification, else 880 * \c true if the given sample rate conforms to the specification, else
878 * \c false. 881 * \c false.
879 */ 882 */
880 FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate); 883 FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
881 884
885 /** Tests that a blocksize at the given sample rate is valid for the FLAC
886 * subset.
887 *
888 * \param blocksize The blocksize to test for compliance.
889 * \param sample_rate The sample rate is needed, since the valid subset
890 * blocksize depends on the sample rate.
891 * \retval FLAC__bool
892 * \c true if the given blocksize conforms to the specification for the
893 * subset at the given sample rate, else \c false.
894 */
895 FLAC_API FLAC__bool FLAC__format_blocksize_is_subset(unsigned blocksize, unsigne d sample_rate);
896
882 /** Tests that a sample rate is valid for the FLAC subset. The subset rules 897 /** Tests that a sample rate is valid for the FLAC subset. The subset rules
883 * for valid sample rates are slightly more complex since the rate has to 898 * for valid sample rates are slightly more complex since the rate has to
884 * be expressible completely in the frame header. 899 * be expressible completely in the frame header.
885 * 900 *
886 * \param sample_rate The sample rate to test for compliance. 901 * \param sample_rate The sample rate to test for compliance.
887 * \retval FLAC__bool 902 * \retval FLAC__bool
888 * \c true if the given sample rate conforms to the specification for the 903 * \c true if the given sample rate conforms to the specification for the
889 * subset, else \c false. 904 * subset, else \c false.
890 */ 905 */
891 FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate); 906 FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate);
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 */ 1016 */
1002 FLAC_API FLAC__bool FLAC__format_picture_is_legal(const FLAC__StreamMetadata_Pic ture *picture, const char **violation); 1017 FLAC_API FLAC__bool FLAC__format_picture_is_legal(const FLAC__StreamMetadata_Pic ture *picture, const char **violation);
1003 1018
1004 /* \} */ 1019 /* \} */
1005 1020
1006 #ifdef __cplusplus 1021 #ifdef __cplusplus
1007 } 1022 }
1008 #endif 1023 #endif
1009 1024
1010 #endif 1025 #endif
OLDNEW
« no previous file with comments | « include/FLAC/export.h ('k') | include/FLAC/metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698