opus.h   opus.h 
/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited /* Copyright (c) 2010-2012 IETF Trust, Xiph.Org Foundation, Skype Limited. All rights reserved.
Written by Jean-Marc Valin and Koen Vos */ Written by Jean-Marc Valin and Koen Vos */
/* /*
This file is extracted from RFC6716. Please see that RFC for additional
information.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
- Redistributions of source code must retain the above copyright - Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 opus_defines.h   opus_defines.h 
/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited /* Copyright (c) 2010-2012 IETF Trust, Xiph.Org Foundation, Skype Limited. All rights reserved.
Written by Jean-Marc Valin and Koen Vos */ Written by Jean-Marc Valin and Koen Vos */
/* /*
This file is extracted from RFC6716. Please see that RFC for additional
information.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
- Redistributions of source code must retain the above copyright - Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 opus_multistream.h   opus_multistream.h 
/* Copyright (c) 2011 Xiph.Org Foundation /* Copyright (c) 2011-2012 IETF Trust, Xiph.Org Foundation. All rights rese rved.
Written by Jean-Marc Valin */ Written by Jean-Marc Valin */
/* /*
This file is extracted from RFC6716. Please see that RFC for additional
information.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
- Redistributions of source code must retain the above copyright - Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
skipping to change at line 43 skipping to change at line 47
/** /**
* @file opus_multistream.h * @file opus_multistream.h
* @brief Opus reference implementation multistream API * @brief Opus reference implementation multistream API
*/ */
#ifndef OPUS_MULTISTREAM_H #ifndef OPUS_MULTISTREAM_H
#define OPUS_MULTISTREAM_H #define OPUS_MULTISTREAM_H
#include "opus.h" #include "opus.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct OpusMSEncoder OpusMSEncoder; typedef struct OpusMSEncoder OpusMSEncoder;
typedef struct OpusMSDecoder OpusMSDecoder; typedef struct OpusMSDecoder OpusMSDecoder;
#define __opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(pt r))) #define __opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(pt r)))
#define __opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(pt r))) #define __opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(pt r)))
#define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120 #define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
#define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122 #define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
#define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODE R_STATE_REQUEST, __opus_check_int(x), __opus_check_encstate_ptr(y) #define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODE R_STATE_REQUEST, __opus_check_int(x), __opus_check_encstate_ptr(y)
skipping to change at line 169 skipping to change at line 177
int streams, /**< Total number of coded streams */ int streams, /**< Total number of coded streams */
int coupled_streams /**< Number of coupled (stereo) streams */ int coupled_streams /**< Number of coupled (stereo) streams */
); );
/** Get or set options on a multistream decoder state */ /** Get or set options on a multistream decoder state */
OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request , ...); OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request , ...);
/** Deallocate a multistream decoder state object */ /** Deallocate a multistream decoder state object */
OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st); OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
#ifdef __cplusplus
}
#endif
#endif /* OPUS_MULTISTREAM_H */ #endif /* OPUS_MULTISTREAM_H */
 End of changes. 4 change blocks. 
1 lines changed or deleted 13 lines changed or added


 opus_types.h   opus_types.h 
/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */ /* (C) COPYRIGHT 1994-2012 IETF Trust, Xiph.Org Foundation. All rights rese rved */
/* Modified by Jean-Marc Valin */ /* Modified by Jean-Marc Valin */
/* /*
This file is extracted from RFC6716. Please see that RFC for additional
information.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
- Redistributions of source code must retain the above copyright - Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/