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

Side by Side Diff: third_party/opus/src/include/opus_multistream.h

Issue 2962373002: [Opus] Update to v1.2.1 (Closed)
Patch Set: Include minor updates including fix for win_clang Created 3 years, 5 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
OLDNEW
1 /* Copyright (c) 2011 Xiph.Org Foundation 1 /* Copyright (c) 2011 Xiph.Org Foundation
2 Written by Jean-Marc Valin */ 2 Written by Jean-Marc Valin */
3 /* 3 /*
4 Redistribution and use in source and binary forms, with or without 4 Redistribution and use in source and binary forms, with or without
5 modification, are permitted provided that the following conditions 5 modification, are permitted provided that the following conditions
6 are met: 6 are met:
7 7
8 - Redistributions of source code must retain the above copyright 8 - Redistributions of source code must retain the above copyright
9 notice, this list of conditions and the following disclaimer. 9 notice, this list of conditions and the following disclaimer.
10 10
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 266
267 OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_enc oder_create( 267 OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_enc oder_create(
268 opus_int32 Fs, 268 opus_int32 Fs,
269 int channels, 269 int channels,
270 int mapping_family, 270 int mapping_family,
271 int *streams, 271 int *streams,
272 int *coupled_streams, 272 int *coupled_streams,
273 unsigned char *mapping, 273 unsigned char *mapping,
274 int application, 274 int application,
275 int *error 275 int *error
276 ) OPUS_ARG_NONNULL(5); 276 ) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
277 277
278 /** Initialize a previously allocated multistream encoder state. 278 /** Initialize a previously allocated multistream encoder state.
279 * The memory pointed to by \a st must be at least the size returned by 279 * The memory pointed to by \a st must be at least the size returned by
280 * opus_multistream_encoder_get_size(). 280 * opus_multistream_encoder_get_size().
281 * This is intended for applications which use their own allocator instead of 281 * This is intended for applications which use their own allocator instead of
282 * malloc. 282 * malloc.
283 * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL. 283 * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
284 * @see opus_multistream_encoder_create 284 * @see opus_multistream_encoder_create
285 * @see opus_multistream_encoder_get_size 285 * @see opus_multistream_encoder_get_size
286 * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize. 286 * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 335
336 OPUS_EXPORT int opus_multistream_surround_encoder_init( 336 OPUS_EXPORT int opus_multistream_surround_encoder_init(
337 OpusMSEncoder *st, 337 OpusMSEncoder *st,
338 opus_int32 Fs, 338 opus_int32 Fs,
339 int channels, 339 int channels,
340 int mapping_family, 340 int mapping_family,
341 int *streams, 341 int *streams,
342 int *coupled_streams, 342 int *coupled_streams,
343 unsigned char *mapping, 343 unsigned char *mapping,
344 int application 344 int application
345 ) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6); 345 ) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6) OPUS_ARG_NONNULL(7 );
346 346
347 /** Encodes a multistream Opus frame. 347 /** Encodes a multistream Opus frame.
348 * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state. 348 * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
349 * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved 349 * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
350 * samples. 350 * samples.
351 * This must contain 351 * This must contain
352 * <code>frame_size*channels</code> 352 * <code>frame_size*channels</code>
353 * samples. 353 * samples.
354 * @param frame_size <tt>int</tt>: Number of samples per channel in the input 354 * @param frame_size <tt>int</tt>: Number of samples per channel in the input
355 * signal. 355 * signal.
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 651
652 /**@}*/ 652 /**@}*/
653 653
654 /**@}*/ 654 /**@}*/
655 655
656 #ifdef __cplusplus 656 #ifdef __cplusplus
657 } 657 }
658 #endif 658 #endif
659 659
660 #endif /* OPUS_MULTISTREAM_H */ 660 #endif /* OPUS_MULTISTREAM_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698