diff options
Diffstat (limited to 'tinyDAV/include/tinydav/codecs')
27 files changed, 556 insertions, 570 deletions
diff --git a/tinyDAV/include/tinydav/codecs/amr/tdav_codec_amr.h b/tinyDAV/include/tinydav/codecs/amr/tdav_codec_amr.h index cb0e33e..d739ad0 100755 --- a/tinyDAV/include/tinydav/codecs/amr/tdav_codec_amr.h +++ b/tinyDAV/include/tinydav/codecs/amr/tdav_codec_amr.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -44,38 +44,35 @@ TDAV_BEGIN_DECLS #define TDAV_CODEC_AMR(self) ((tdav_codec_amr_t*)(self)) -typedef enum tdav_codec_amr_type_e -{ - tdav_codec_amr_type_nb, - tdav_codec_amr_type_wb, +typedef enum tdav_codec_amr_type_e { + tdav_codec_amr_type_nb, + tdav_codec_amr_type_wb, } tdav_codec_amr_type_t; -typedef enum tdav_codec_amr_mode_e -{ - tdav_codec_amr_mode_oa, - tdav_codec_amr_mode_be, +typedef enum tdav_codec_amr_mode_e { + tdav_codec_amr_mode_oa, + tdav_codec_amr_mode_be, } tdav_codec_amr_mode_t; /** Base class for all AMR codecs */ -typedef struct tdav_codec_amr_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; - - tdav_codec_amr_type_t type; - tdav_codec_amr_mode_t mode; - - enum Mode encoder_mode; - void* encoder; - void* decoder; - - unsigned modes:16; /**< 0..7 for NB and 0..8 for WB plus SID, SPEECH_LOST, NO_DATA etc etc */ - unsigned mcp:2; /**< mode-change-periode (1 or 2) */ - unsigned mcc:2; /**< mode-change-capability (1 or 2) */ - unsigned mcn:1; /**< mode-change-neighnor (0 or 1) */ - unsigned crc:1; /**< 0 or 1 */ - unsigned robust_sorting:1; /**< robust-sorting (0 or 1) */ +typedef struct tdav_codec_amr_s { + TMEDIA_DECLARE_CODEC_AUDIO; + + tdav_codec_amr_type_t type; + tdav_codec_amr_mode_t mode; + + enum Mode encoder_mode; + void* encoder; + void* decoder; + + unsigned modes:16; /**< 0..7 for NB and 0..8 for WB plus SID, SPEECH_LOST, NO_DATA etc etc */ + unsigned mcp:2; /**< mode-change-periode (1 or 2) */ + unsigned mcc:2; /**< mode-change-capability (1 or 2) */ + unsigned mcn:1; /**< mode-change-neighnor (0 or 1) */ + unsigned crc:1; /**< 0 or 1 */ + unsigned robust_sorting:1; /**< robust-sorting (0 or 1) */ } tdav_codec_amr_t; diff --git a/tinyDAV/include/tinydav/codecs/bfcp/tdav_codec_bfcp.h b/tinyDAV/include/tinydav/codecs/bfcp/tdav_codec_bfcp.h index e0a0dca..f7ae4b8 100755 --- a/tinyDAV/include/tinydav/codecs/bfcp/tdav_codec_bfcp.h +++ b/tinyDAV/include/tinydav/codecs/bfcp/tdav_codec_bfcp.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2014 Mamadou DIOP. -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -31,9 +31,8 @@ TDAV_BEGIN_DECLS /** BFCP codec */ -typedef struct tdav_codec_bfcp_s -{ - TMEDIA_DECLARE_CODEC_BFCP; +typedef struct tdav_codec_bfcp_s { + TMEDIA_DECLARE_CODEC_BFCP; } tdav_codec_bfcp_t; diff --git a/tinyDAV/include/tinydav/codecs/bv/tdav_codec_bv16.h b/tinyDAV/include/tinydav/codecs/bv/tdav_codec_bv16.h index 3790a71..3bdf465 100755 --- a/tinyDAV/include/tinydav/codecs/bv/tdav_codec_bv16.h +++ b/tinyDAV/include/tinydav/codecs/bv/tdav_codec_bv16.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -40,21 +40,20 @@ TDAV_BEGIN_DECLS /** BV16 codec */ -typedef struct tdav_codec_bv16_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; +typedef struct tdav_codec_bv16_s { + TMEDIA_DECLARE_CODEC_AUDIO; - struct { - void *state; - void *bs; - void *x; - } encoder; + struct { + void *state; + void *bs; + void *x; + } encoder; - struct { - void *state; - void *bs; - void *x; - } decoder; + struct { + void *state; + void *bs; + void *x; + } decoder; } tdav_codec_bv16_t; diff --git a/tinyDAV/include/tinydav/codecs/dtmf/tdav_codec_dtmf.h b/tinyDAV/include/tinydav/codecs/dtmf/tdav_codec_dtmf.h index 6082de7..378295f 100755 --- a/tinyDAV/include/tinydav/codecs/dtmf/tdav_codec_dtmf.h +++ b/tinyDAV/include/tinydav/codecs/dtmf/tdav_codec_dtmf.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -36,9 +36,8 @@ TDAV_BEGIN_DECLS -typedef struct tdav_codec_dtmf_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; +typedef struct tdav_codec_dtmf_s { + TMEDIA_DECLARE_CODEC_AUDIO; } tdav_codec_dtmf_t; diff --git a/tinyDAV/include/tinydav/codecs/fec/tdav_codec_red.h b/tinyDAV/include/tinydav/codecs/fec/tdav_codec_red.h index 80659b8..89ad3a1 100755 --- a/tinyDAV/include/tinydav/codecs/fec/tdav_codec_red.h +++ b/tinyDAV/include/tinydav/codecs/fec/tdav_codec_red.h @@ -2,19 +2,19 @@ * Copyright (C) 2012 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/fec/tdav_codec_ulpfec.h b/tinyDAV/include/tinydav/codecs/fec/tdav_codec_ulpfec.h index bfd9a50..447c97a 100755 --- a/tinyDAV/include/tinydav/codecs/fec/tdav_codec_ulpfec.h +++ b/tinyDAV/include/tinydav/codecs/fec/tdav_codec_ulpfec.h @@ -2,19 +2,19 @@ * Copyright (C) 2012 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/g711/g711.h b/tinyDAV/include/tinydav/codecs/g711/g711.h index cb79793..b8aec63 100755 --- a/tinyDAV/include/tinydav/codecs/g711/g711.h +++ b/tinyDAV/include/tinydav/codecs/g711/g711.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/g711/tdav_codec_g711.h b/tinyDAV/include/tinydav/codecs/g711/tdav_codec_g711.h index 3343636..8efbead 100755 --- a/tinyDAV/include/tinydav/codecs/g711/tdav_codec_g711.h +++ b/tinyDAV/include/tinydav/codecs/g711/tdav_codec_g711.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -36,16 +36,14 @@ TDAV_BEGIN_DECLS /** G.711u codec */ -typedef struct tdav_codec_g711u_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; +typedef struct tdav_codec_g711u_s { + TMEDIA_DECLARE_CODEC_AUDIO; } tdav_codec_g711u_t; /** G.711a codec */ -typedef struct tdav_codec_g711a_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; +typedef struct tdav_codec_g711a_s { + TMEDIA_DECLARE_CODEC_AUDIO; } tdav_codec_g711a_t; diff --git a/tinyDAV/include/tinydav/codecs/g722/g722_enc_dec.h b/tinyDAV/include/tinydav/codecs/g722/g722_enc_dec.h index efa45ec..a2bc999 100755 --- a/tinyDAV/include/tinydav/codecs/g722/g722_enc_dec.h +++ b/tinyDAV/include/tinydav/codecs/g722/g722_enc_dec.h @@ -7,7 +7,7 @@ * * Copyright (C) 2005 Steve Underwood * - * Despite my general liking of the GPL, I place my own contributions + * Despite my general liking of the GPL, I place my own contributions * to this code in the public domain for the benefit of all mankind - * even the slimy ones who might try to proprietize my work and use it * to my detriment. @@ -49,14 +49,12 @@ codec is considerably faster, and still fully compatible with wideband terminals #define TDAV_INT16_MAX 32767 #define TDAV_INT16_MIN -32768 -enum -{ +enum { G722_SAMPLE_RATE_8000 = 0x0001, G722_PACKED = 0x0002 }; -typedef struct -{ +typedef struct { /*! TRUE if the operating in the special ITU test mode, with the band split filters disabled. */ int itu_test_mode; @@ -70,8 +68,7 @@ typedef struct /*! Signal history for the QMF */ int x[24]; - struct - { + struct { int s; int sp; int sz; @@ -93,8 +90,7 @@ typedef struct int out_bits; } g722_encode_state_t; -typedef struct -{ +typedef struct { /*! TRUE if the operating in the special ITU test mode, with the band split filters disabled. */ int itu_test_mode; @@ -108,8 +104,7 @@ typedef struct /*! Signal history for the QMF */ int x[24]; - struct - { + struct { int s; int sp; int sz; @@ -124,7 +119,7 @@ typedef struct int nb; int det; } band[2]; - + unsigned int in_buffer; int in_bits; unsigned int out_buffer; diff --git a/tinyDAV/include/tinydav/codecs/g722/tdav_codec_g722.h b/tinyDAV/include/tinydav/codecs/g722/tdav_codec_g722.h index 6484022..d710a7a 100755 --- a/tinyDAV/include/tinydav/codecs/g722/tdav_codec_g722.h +++ b/tinyDAV/include/tinydav/codecs/g722/tdav_codec_g722.h @@ -2,19 +2,19 @@ * Copyright (C) 2011 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/g729/tdav_codec_g729.h b/tinyDAV/include/tinydav/codecs/g729/tdav_codec_g729.h index 3b4ec05..6517f74 100755 --- a/tinyDAV/include/tinydav/codecs/g729/tdav_codec_g729.h +++ b/tinyDAV/include/tinydav/codecs/g729/tdav_codec_g729.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -43,30 +43,29 @@ TDAV_BEGIN_DECLS /** G.729abb codec */ -typedef struct tdav_codec_g729ab_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; - - struct{ - Word16 prm[PRM_SIZE+1]; /* Analysis parameters + frame type */ - Word16 serial[SERIAL_SIZE]; /* Output bitstream buffer */ - - Word16 frame; /* frame counter */ - - /* For G.729B */ - Word16 vad_enable; - } encoder; - - struct{ - Word16 serial[SERIAL_SIZE]; /* Serial stream */ - Word16 synth_buf[L_FRAME+M], *synth; /* Synthesis */ - Word16 parm[PRM_SIZE+2]; /* Synthesis parameters */ - Word16 Az_dec[MP1*2]; /* Decoded Az for post-filter */ - Word16 T2[2]; /* Pitch lag for 2 subframes */ - - /* For G.729B */ - Word16 Vad; - } decoder; +typedef struct tdav_codec_g729ab_s { + TMEDIA_DECLARE_CODEC_AUDIO; + + struct { + Word16 prm[PRM_SIZE+1]; /* Analysis parameters + frame type */ + Word16 serial[SERIAL_SIZE]; /* Output bitstream buffer */ + + Word16 frame; /* frame counter */ + + /* For G.729B */ + Word16 vad_enable; + } encoder; + + struct { + Word16 serial[SERIAL_SIZE]; /* Serial stream */ + Word16 synth_buf[L_FRAME+M], *synth; /* Synthesis */ + Word16 parm[PRM_SIZE+2]; /* Synthesis parameters */ + Word16 Az_dec[MP1*2]; /* Decoded Az for post-filter */ + Word16 T2[2]; /* Pitch lag for 2 subframes */ + + /* For G.729B */ + Word16 Vad; + } decoder; } tdav_codec_g729ab_t; diff --git a/tinyDAV/include/tinydav/codecs/gsm/tdav_codec_gsm.h b/tinyDAV/include/tinydav/codecs/gsm/tdav_codec_gsm.h index 1fff744..64c1136 100755 --- a/tinyDAV/include/tinydav/codecs/gsm/tdav_codec_gsm.h +++ b/tinyDAV/include/tinydav/codecs/gsm/tdav_codec_gsm.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -41,12 +41,11 @@ TDAV_BEGIN_DECLS /** GSM codec */ -typedef struct tdav_codec_gsm_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; +typedef struct tdav_codec_gsm_s { + TMEDIA_DECLARE_CODEC_AUDIO; - gsm encoder; - gsm decoder; + gsm encoder; + gsm decoder; } tdav_codec_gsm_t; diff --git a/tinyDAV/include/tinydav/codecs/h261/tdav_codec_h261.h b/tinyDAV/include/tinydav/codecs/h261/tdav_codec_h261.h index 7f66a3a..f871efd 100755 --- a/tinyDAV/include/tinydav/codecs/h261/tdav_codec_h261.h +++ b/tinyDAV/include/tinydav/codecs/h261/tdav_codec_h261.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -44,34 +44,33 @@ TDAV_BEGIN_DECLS #define TDAV_CODEC_H261(self) ((tdav_codec_h261_t*)(self)) /** H.2261 codec */ -typedef struct tdav_codec_h261_s -{ - TMEDIA_DECLARE_CODEC_VIDEO; - - struct{ - uint8_t* ptr; - tsk_size_t size; - } rtp; - - // Encoder - struct{ - AVCodec* codec; - AVCodecContext* context; - AVFrame* picture; - void* buffer; - } encoder; - - // decoder - struct{ - AVCodec* codec; - AVCodecContext* context; - AVFrame* picture; - - void* accumulator; - uint8_t ebit; - tsk_size_t accumulator_pos; - uint16_t last_seq; - } decoder; +typedef struct tdav_codec_h261_s { + TMEDIA_DECLARE_CODEC_VIDEO; + + struct { + uint8_t* ptr; + tsk_size_t size; + } rtp; + + // Encoder + struct { + AVCodec* codec; + AVCodecContext* context; + AVFrame* picture; + void* buffer; + } encoder; + + // decoder + struct { + AVCodec* codec; + AVCodecContext* context; + AVFrame* picture; + + void* accumulator; + uint8_t ebit; + tsk_size_t accumulator_pos; + uint16_t last_seq; + } decoder; } tdav_codec_h261_t; diff --git a/tinyDAV/include/tinydav/codecs/h263/tdav_codec_h263.h b/tinyDAV/include/tinydav/codecs/h263/tdav_codec_h263.h index 6a2880f..b8a4abd 100755 --- a/tinyDAV/include/tinydav/codecs/h263/tdav_codec_h263.h +++ b/tinyDAV/include/tinydav/codecs/h263/tdav_codec_h263.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264.h b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264.h index 9de6fdd..57da492 100755 --- a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264.h +++ b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -46,7 +46,7 @@ tsk_bool_t tdav_codec_passthrough_h264_is_supported(); static inline tsk_bool_t tdav_codec_h264_is_ffmpeg_plugin(const tmedia_codec_plugin_def_t *plugin) { - return(plugin && ((plugin == tdav_codec_h264_base_plugin_def_t) || (plugin == tdav_codec_h264_main_plugin_def_t))); + return(plugin && ((plugin == tdav_codec_h264_base_plugin_def_t) || (plugin == tdav_codec_h264_main_plugin_def_t))); } TDAV_END_DECLS diff --git a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cisco.h b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cisco.h index b464f12..bcd143b 100755 --- a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cisco.h +++ b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cisco.h @@ -1,19 +1,19 @@ /* * Copyright (C) 2014-2015 Mamadou DIOP. * -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_common.h b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_common.h index 1cf2e97..b2e01ba 100755 --- a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_common.h +++ b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_common.h @@ -2,19 +2,19 @@ * Copyright (C) 2011 Doubango Telecom <http://www.doubango.org>. * * Contact: Mamadou Diop <diopmamadou(at)doubango(DOT)org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -90,47 +90,44 @@ static const int32_t H264_LEVEL_TO_ZERO_BASED_INDEX[255] = { }; // Because of FD, declare it here -typedef enum packetization_mode_e{ - Unknown_Mode = -1, - Single_NAL_Unit_Mode = 0, /* Single NAL mode (Only nals from 1-23 are allowed) */ - Non_Interleaved_Mode = 1, /* Non-interleaved Mode: 1-23, 24 (STAP-A), 28 (FU-A) are allowed */ - Interleaved_Mode = 2 /* 25 (STAP-B), 26 (MTAP16), 27 (MTAP24), 28 (FU-A), and 29 (FU-B) are allowed.*/ +typedef enum packetization_mode_e { + Unknown_Mode = -1, + Single_NAL_Unit_Mode = 0, /* Single NAL mode (Only nals from 1-23 are allowed) */ + Non_Interleaved_Mode = 1, /* Non-interleaved Mode: 1-23, 24 (STAP-A), 28 (FU-A) are allowed */ + Interleaved_Mode = 2 /* 25 (STAP-B), 26 (MTAP16), 27 (MTAP24), 28 (FU-A), and 29 (FU-B) are allowed.*/ } packetization_mode_t; -typedef struct tdav_codec_h264_common_s -{ - TMEDIA_DECLARE_CODEC_VIDEO; +typedef struct tdav_codec_h264_common_s { + TMEDIA_DECLARE_CODEC_VIDEO; - profile_idc_t profile; - uint8_t profile_iop; - level_idc_t level; - unsigned maxFS; + profile_idc_t profile; + uint8_t profile_iop; + level_idc_t level; + unsigned maxFS; - packetization_mode_t pack_mode_remote; // remote packetization mode - packetization_mode_t pack_mode_local; // local packetization mode + packetization_mode_t pack_mode_remote; // remote packetization mode + packetization_mode_t pack_mode_local; // local packetization mode - struct{ - uint8_t* ptr; - tsk_size_t size; - } rtp; + struct { + uint8_t* ptr; + tsk_size_t size; + } rtp; } tdav_codec_h264_common_t; #define TDAV_CODEC_H264_COMMON(self) ((tdav_codec_h264_common_t*)(self)) #define TDAV_DECLARE_CODEC_H264_COMMON tdav_codec_h264_common_t __video__ -typedef struct tdav_codec_h264_common_level_size_xs -{ - level_idc_t level; - unsigned width; +typedef struct tdav_codec_h264_common_level_size_xs { + level_idc_t level; + unsigned width; unsigned height; - unsigned maxFS; // From "Table A-1 – Level limits" + unsigned maxFS; // From "Table A-1 – Level limits" } tdav_codec_h264_common_level_size_xt; -static const tdav_codec_h264_common_level_size_xt tdav_codec_h264_common_level_sizes [] = -{ - {level_idc_1_0, 128, 96, 99}, +static const tdav_codec_h264_common_level_size_xt tdav_codec_h264_common_level_sizes [] = { + {level_idc_1_0, 128, 96, 99}, #if 0 {level_idc_1_b, 128, 96, 99}, #endif @@ -153,278 +150,289 @@ static const tdav_codec_h264_common_level_size_xt tdav_codec_h264_common_level_s static int tdav_codec_h264_common_size_from_level(level_idc_t level, unsigned *width, unsigned *height) { - tsk_size_t i; - for(i = 0; i < sizeof(tdav_codec_h264_common_level_sizes)/sizeof(tdav_codec_h264_common_level_sizes[0]); ++i){ - if(tdav_codec_h264_common_level_sizes[i].level == level){ - *width = tdav_codec_h264_common_level_sizes[i].width; - *height = tdav_codec_h264_common_level_sizes[i].height; - return 0; - } - } - return -1; + tsk_size_t i; + for(i = 0; i < sizeof(tdav_codec_h264_common_level_sizes)/sizeof(tdav_codec_h264_common_level_sizes[0]); ++i) { + if(tdav_codec_h264_common_level_sizes[i].level == level) { + *width = tdav_codec_h264_common_level_sizes[i].width; + *height = tdav_codec_h264_common_level_sizes[i].height; + return 0; + } + } + return -1; } static int tdav_codec_h264_common_size_from_fs(unsigned maxFS, unsigned *width, unsigned *height) { - tsk_size_t i; - int ret = -1; - for (i = 0; i < sizeof(tdav_codec_h264_common_level_sizes)/sizeof(tdav_codec_h264_common_level_sizes[0]); ++i){ - if (tdav_codec_h264_common_level_sizes[i].maxFS <= maxFS){ - *width = tdav_codec_h264_common_level_sizes[i].width; - *height = tdav_codec_h264_common_level_sizes[i].height; - ret = 0; - } - else { - break; - } - } - return ret; + tsk_size_t i; + int ret = -1; + for (i = 0; i < sizeof(tdav_codec_h264_common_level_sizes)/sizeof(tdav_codec_h264_common_level_sizes[0]); ++i) { + if (tdav_codec_h264_common_level_sizes[i].maxFS <= maxFS) { + *width = tdav_codec_h264_common_level_sizes[i].width; + *height = tdav_codec_h264_common_level_sizes[i].height; + ret = 0; + } + else { + break; + } + } + return ret; } static int tdav_codec_h264_common_level_from_size(unsigned width, unsigned height, level_idc_t *level) { - tsk_size_t i; - unsigned maxFS = (((width + 15) >> 4) * ((height + 15) >> 4)); - static const tsk_size_t __tdav_codec_h264_common_level_sizes_count = sizeof(tdav_codec_h264_common_level_sizes)/sizeof(tdav_codec_h264_common_level_sizes[0]); - for (i = 0; i < __tdav_codec_h264_common_level_sizes_count; ++i){ - if (/*tdav_codec_h264_common_level_sizes[i].maxFS*/ ((tdav_codec_h264_common_level_sizes[i].width * tdav_codec_h264_common_level_sizes[i].height) >> 8) >= maxFS){ - *level = tdav_codec_h264_common_level_sizes[i].level; - return 0; - } - } - TSK_DEBUG_WARN("Failed to find default level for size=(%ux%u)", width, height); - *level = tdav_codec_h264_common_level_sizes[__tdav_codec_h264_common_level_sizes_count - 1].level; - return 0; + tsk_size_t i; + unsigned maxFS = (((width + 15) >> 4) * ((height + 15) >> 4)); + static const tsk_size_t __tdav_codec_h264_common_level_sizes_count = sizeof(tdav_codec_h264_common_level_sizes)/sizeof(tdav_codec_h264_common_level_sizes[0]); + for (i = 0; i < __tdav_codec_h264_common_level_sizes_count; ++i) { + if (/*tdav_codec_h264_common_level_sizes[i].maxFS*/ ((tdav_codec_h264_common_level_sizes[i].width * tdav_codec_h264_common_level_sizes[i].height) >> 8) >= maxFS) { + *level = tdav_codec_h264_common_level_sizes[i].level; + return 0; + } + } + TSK_DEBUG_WARN("Failed to find default level for size=(%ux%u)", width, height); + *level = tdav_codec_h264_common_level_sizes[__tdav_codec_h264_common_level_sizes_count - 1].level; + return 0; } static int tdav_codec_h264_common_init(tdav_codec_h264_common_t * h264) { - if (h264) { - level_idc_t level; - // because at this step 'tmedia_codec_init()' is not called yet and we need default size to compute the H.264 level - if (TMEDIA_CODEC_VIDEO(h264)->out.width == 0 || TMEDIA_CODEC_VIDEO(h264)->in.width == 0) { - unsigned width, height; - tmedia_pref_video_size_t pref_size = tmedia_defaults_get_pref_video_size(); - if (tmedia_video_get_size(pref_size, &width, &height) == 0) { - TMEDIA_CODEC_VIDEO(h264)->out.width = TMEDIA_CODEC_VIDEO(h264)->in.width = width; - TMEDIA_CODEC_VIDEO(h264)->out.height = TMEDIA_CODEC_VIDEO(h264)->in.height = height; - } - } - h264->maxFS = (((TMEDIA_CODEC_VIDEO(h264)->out.width + 15) >> 4) * ((TMEDIA_CODEC_VIDEO(h264)->out.height + 15) >> 4)); - if ((tdav_codec_h264_common_level_from_size(TMEDIA_CODEC_VIDEO(h264)->out.width, TMEDIA_CODEC_VIDEO(h264)->out.height, &level)) == 0){ - h264->maxFS = TSK_MIN((int32_t)h264->maxFS, MaxFS[H264_LEVEL_TO_ZERO_BASED_INDEX[level]]); - h264->level = level; - } - h264->profile_iop = 0x80; - h264->pack_mode_local = H264_PACKETIZATION_MODE; - h264->pack_mode_remote = Unknown_Mode; - } - return 0; + if (h264) { + level_idc_t level; + // because at this step 'tmedia_codec_init()' is not called yet and we need default size to compute the H.264 level + if (TMEDIA_CODEC_VIDEO(h264)->out.width == 0 || TMEDIA_CODEC_VIDEO(h264)->in.width == 0) { + unsigned width, height; + tmedia_pref_video_size_t pref_size = tmedia_defaults_get_pref_video_size(); + if (tmedia_video_get_size(pref_size, &width, &height) == 0) { + TMEDIA_CODEC_VIDEO(h264)->out.width = TMEDIA_CODEC_VIDEO(h264)->in.width = width; + TMEDIA_CODEC_VIDEO(h264)->out.height = TMEDIA_CODEC_VIDEO(h264)->in.height = height; + } + } + h264->maxFS = (((TMEDIA_CODEC_VIDEO(h264)->out.width + 15) >> 4) * ((TMEDIA_CODEC_VIDEO(h264)->out.height + 15) >> 4)); + if ((tdav_codec_h264_common_level_from_size(TMEDIA_CODEC_VIDEO(h264)->out.width, TMEDIA_CODEC_VIDEO(h264)->out.height, &level)) == 0) { + h264->maxFS = TSK_MIN((int32_t)h264->maxFS, MaxFS[H264_LEVEL_TO_ZERO_BASED_INDEX[level]]); + h264->level = level; + } + h264->profile_iop = 0x80; + h264->pack_mode_local = H264_PACKETIZATION_MODE; + h264->pack_mode_remote = Unknown_Mode; + } + return 0; } static int tdav_codec_h264_common_deinit(tdav_codec_h264_common_t * h264) { - TSK_DEBUG_INFO("tdav_codec_h264_common_deinit"); - if(h264){ - tmedia_codec_video_deinit(TMEDIA_CODEC_VIDEO(h264)); - TSK_FREE(h264->rtp.ptr); - h264->rtp.size = 0; - } - return 0; + TSK_DEBUG_INFO("tdav_codec_h264_common_deinit"); + if(h264) { + tmedia_codec_video_deinit(TMEDIA_CODEC_VIDEO(h264)); + TSK_FREE(h264->rtp.ptr); + h264->rtp.size = 0; + } + return 0; } static int tdav_codec_h264_common_get_profile_and_level(const char* fmtp, profile_idc_t *profile, level_idc_t *level) { - tsk_size_t size = tsk_strlen(fmtp); - int start, end; - int ret = -1; - - *profile = profile_idc_none; - *level = level_idc_none; - - if((start = tsk_strindexOf(fmtp, size, "profile-level-id")) !=-1){ - tsk_param_t* param; - if((end = (int)tsk_strindexOf((fmtp+start), (tsk_size_t)(size-start), ";")) == -1){ - end = (int)size; - } - - if((param = tsk_params_parse_param((fmtp+start), (end-start)))){ - profile_idc_t p_idc; - level_idc_t l_idc; - if(param->value){ - tsk_strtrim_both(¶m->value); - } - - tdav_codec_h264_parse_profile(param->value, &p_idc, tsk_null, &l_idc); - - switch(p_idc){ - case profile_idc_baseline: - case profile_idc_main: - *profile = p_idc; - *level = l_idc; - ret = 0; - break; - case profile_idc_extended: - case profile_idc_high: - default: - /* Not supported */ - break; - } - - TSK_OBJECT_SAFE_FREE(param); - } - } - return ret; + tsk_size_t size = tsk_strlen(fmtp); + int start, end; + int ret = -1; + + *profile = profile_idc_none; + *level = level_idc_none; + + if((start = tsk_strindexOf(fmtp, size, "profile-level-id")) !=-1) { + tsk_param_t* param; + if((end = (int)tsk_strindexOf((fmtp+start), (tsk_size_t)(size-start), ";")) == -1) { + end = (int)size; + } + + if((param = tsk_params_parse_param((fmtp+start), (end-start)))) { + profile_idc_t p_idc; + level_idc_t l_idc; + if(param->value) { + tsk_strtrim_both(¶m->value); + } + + tdav_codec_h264_parse_profile(param->value, &p_idc, tsk_null, &l_idc); + + switch(p_idc) { + case profile_idc_baseline: + case profile_idc_main: + *profile = p_idc; + *level = l_idc; + ret = 0; + break; + case profile_idc_extended: + case profile_idc_high: + default: + /* Not supported */ + break; + } + + TSK_OBJECT_SAFE_FREE(param); + } + } + return ret; } static tsk_bool_t tdav_codec_h264_common_sdp_att_match(tdav_codec_h264_common_t* h264, const char* att_name, const char* att_value) { - tsk_bool_t ret = tsk_true; - - if(!h264){ - TSK_DEBUG_ERROR("Invalid parameter"); - return tsk_false; - } - - TSK_DEBUG_INFO("[H.264] Trying to match [%s:%s]", att_name, att_value); - - if (tsk_striequals(att_name, "fmtp")) { - int val_int; - profile_idc_t profile; - level_idc_t level; - tsk_params_L_t* params; - - /* Check whether the profile match (If the profile is missing, then we consider that it's ok) */ - if (tdav_codec_h264_common_get_profile_and_level(att_value, &profile, &level) != 0) { - TSK_DEBUG_ERROR("Not valid profile-level: %s", att_value); - return tsk_false; - } - if (h264->profile != profile) { - return tsk_false; - } - else{ - if (h264->level != level) { - // change the output size only when the remote party request lower level. If it request higher (or same) level then, we send our preferred size. - if (h264->level > level) { - unsigned width, height; - h264->level = TSK_MIN(h264->level, level); - if (tdav_codec_h264_common_size_from_level(h264->level, &width, &height) != 0) { - return tsk_false; - } - // Do not change our size if it match the requested level - if (width < TMEDIA_CODEC_VIDEO(h264)->out.width || height < TMEDIA_CODEC_VIDEO(h264)->out.height) { - // Set "out" size. We must not send more than "MaxFS". - // Default "out" is equal to the preferred sized and initialized in init(). - // "TANDBERG/4120 (X7.2.2)" will terminate the call if frame size > maxFS - TMEDIA_CODEC_VIDEO(h264)->out.width = TSK_MIN(TMEDIA_CODEC_VIDEO(h264)->out.width, width); - TMEDIA_CODEC_VIDEO(h264)->out.height = TSK_MIN(TMEDIA_CODEC_VIDEO(h264)->out.height, height); - } - // Set default "in". Will be updated after receiving the first frame. - TMEDIA_CODEC_VIDEO(h264)->in.width = width; - TMEDIA_CODEC_VIDEO(h264)->in.height = height; - } - } - } - - /* e.g. profile-level-id=42e00a; packetization-mode=1; max-br=452; max-mbps=11880 */ - if ((params = tsk_params_fromstring(att_value, ";", tsk_true))) { - - /* === max-br ===*/ - if ((val_int = tsk_params_get_param_value_as_int(params, "max-br")) != -1) { - // should compare "max-br"? - TMEDIA_CODEC_VIDEO(h264)->out.max_br = val_int*1000; - } - - /* === max-fs ===*/ - if ((val_int = tsk_params_get_param_value_as_int(params, "max-fs")) != -1) { - unsigned width_max, height_max, maxFS, currFS; - currFS = (TMEDIA_CODEC_VIDEO(h264)->out.width * TMEDIA_CODEC_VIDEO(h264)->out.height) >> 8; - maxFS = TSK_MIN(h264->maxFS/*preferred*/, (unsigned)val_int/*proposed*/); // make sure we'll never send more than we advertised - if (currFS > maxFS) { // do not use default sizes when we already respect the MaxFS - if (tdav_codec_h264_common_size_from_fs(maxFS, &width_max, &height_max) == 0) { - TMEDIA_CODEC_VIDEO(h264)->out.width = TMEDIA_CODEC_VIDEO(h264)->in.width = width_max; - TMEDIA_CODEC_VIDEO(h264)->out.height = TMEDIA_CODEC_VIDEO(h264)->in.height = height_max; - } - } - } - - /* === max-mbps ===*/ - if ((val_int = tsk_params_get_param_value_as_int(params, "max-mbps")) != -1) { - // should compare "max-mbps"? - TMEDIA_CODEC_VIDEO(h264)->out.max_mbps = val_int*1000; - } - - /* === packetization-mode ===*/ - if ((val_int = tsk_params_get_param_value_as_int(params, "packetization-mode")) != -1) { - if ((packetization_mode_t)val_int == Single_NAL_Unit_Mode || (packetization_mode_t)val_int == Non_Interleaved_Mode) { - TDAV_CODEC_H264_COMMON(h264)->pack_mode_remote = (packetization_mode_t)val_int; - TDAV_CODEC_H264_COMMON(h264)->pack_mode_local = TSK_MAX(TDAV_CODEC_H264_COMMON(h264)->pack_mode_local, TDAV_CODEC_H264_COMMON(h264)->pack_mode_remote); - } - else { - TSK_DEBUG_INFO("packetization-mode not matching"); - ret = tsk_false; - goto bail; - } - } - } + tsk_bool_t ret = tsk_true; + tsk_bool_t outsize_changed = tsk_false; + + if(!h264) { + TSK_DEBUG_ERROR("Invalid parameter"); + return tsk_false; + } + + TSK_DEBUG_INFO("[H.264] Trying to match [%s:%s]", att_name, att_value); + + if (tsk_striequals(att_name, "fmtp")) { + int val_int; + profile_idc_t profile; + level_idc_t level; + tsk_params_L_t* params; + + /* Check whether the profile match (If the profile is missing, then we consider that it's ok) */ + if (tdav_codec_h264_common_get_profile_and_level(att_value, &profile, &level) != 0) { + TSK_DEBUG_ERROR("Not valid profile-level: %s", att_value); + return tsk_false; + } + if (h264->profile != profile) { + return tsk_false; + } + else { + if (h264->level != level) { + // change the output size only when the remote party request lower level. If it request higher (or same) level then, we send our preferred size. + if (h264->level > level) { + unsigned width, height; + h264->level = TSK_MIN(h264->level, level); + if (tdav_codec_h264_common_size_from_level(h264->level, &width, &height) != 0) { + return tsk_false; + } + // Do not change our size if it match the requested level + if (width < TMEDIA_CODEC_VIDEO(h264)->out.width || height < TMEDIA_CODEC_VIDEO(h264)->out.height) { + // Set "out" size. We must not send more than "MaxFS". + // Default "out" is equal to the preferred sized and initialized in init(). + // "TANDBERG/4120 (X7.2.2)" will terminate the call if frame size > maxFS + TMEDIA_CODEC_VIDEO(h264)->out.width = TSK_MIN(TMEDIA_CODEC_VIDEO(h264)->out.width, width); + TMEDIA_CODEC_VIDEO(h264)->out.height = TSK_MIN(TMEDIA_CODEC_VIDEO(h264)->out.height, height); + outsize_changed = tsk_true; + } + // Set default "in". Will be updated after receiving the first frame. + TMEDIA_CODEC_VIDEO(h264)->in.width = width; + TMEDIA_CODEC_VIDEO(h264)->in.height = height; + } + } + } + + /* e.g. profile-level-id=42e00a; packetization-mode=1; max-br=452; max-mbps=11880 */ + if ((params = tsk_params_fromstring(att_value, ";", tsk_true))) { + + /* === max-br ===*/ + if ((val_int = tsk_params_get_param_value_as_int(params, "max-br")) != -1) { + // should compare "max-br"? + TMEDIA_CODEC_VIDEO(h264)->out.max_br = val_int*1000; + } + + /* === max-fs ===*/ + if ((val_int = tsk_params_get_param_value_as_int(params, "max-fs")) != -1) { + unsigned width_max, height_max, maxFS, currFS; + currFS = (TMEDIA_CODEC_VIDEO(h264)->out.width * TMEDIA_CODEC_VIDEO(h264)->out.height) >> 8; + maxFS = TSK_MIN(h264->maxFS/*preferred*/, (unsigned)val_int/*proposed*/); // make sure we'll never send more than we advertised + if (currFS > maxFS) { // do not use default sizes when we already respect the MaxFS + if (tdav_codec_h264_common_size_from_fs(maxFS, &width_max, &height_max) == 0) { + TMEDIA_CODEC_VIDEO(h264)->out.width = TMEDIA_CODEC_VIDEO(h264)->in.width = width_max; + TMEDIA_CODEC_VIDEO(h264)->out.height = TMEDIA_CODEC_VIDEO(h264)->in.height = height_max; + outsize_changed = tsk_true; + } + } + } + + /* === max-mbps ===*/ + if ((val_int = tsk_params_get_param_value_as_int(params, "max-mbps")) != -1) { + // should compare "max-mbps"? + TMEDIA_CODEC_VIDEO(h264)->out.max_mbps = val_int*1000; + } + + /* === packetization-mode ===*/ + if ((val_int = tsk_params_get_param_value_as_int(params, "packetization-mode")) != -1) { + if ((packetization_mode_t)val_int == Single_NAL_Unit_Mode || (packetization_mode_t)val_int == Non_Interleaved_Mode) { + TDAV_CODEC_H264_COMMON(h264)->pack_mode_remote = (packetization_mode_t)val_int; + TDAV_CODEC_H264_COMMON(h264)->pack_mode_local = TSK_MAX(TDAV_CODEC_H264_COMMON(h264)->pack_mode_local, TDAV_CODEC_H264_COMMON(h264)->pack_mode_remote); + } + else { + TSK_DEBUG_INFO("packetization-mode not matching"); + ret = tsk_false; + goto bail; + } + } + } bail: - TSK_OBJECT_SAFE_FREE(params); - } - else if(tsk_striequals(att_name, "imageattr")){ - unsigned in_width, in_height, out_width, out_height; - unsigned width, height; - tsk_size_t s; - if(tmedia_parse_video_imageattr(att_value, TMEDIA_CODEC_VIDEO(h264)->pref_size, &in_width, &in_height, &out_width, &out_height) != 0){ - return tsk_false; - } - // check that 'imageattr' is comform to H.264 'profile-level' - if(tdav_codec_h264_common_size_from_level(h264->level, &width, &height) != 0){ - return tsk_false; - } - if((s = ((width * height * 3) >> 1)) < ((in_width * in_height * 3) >> 1) || s < ((out_width * out_height * 3) >> 1)){ - return tsk_false; - } - - TMEDIA_CODEC_VIDEO(h264)->in.width = in_width; - TMEDIA_CODEC_VIDEO(h264)->in.height = in_height; - TMEDIA_CODEC_VIDEO(h264)->out.width = out_width; - TMEDIA_CODEC_VIDEO(h264)->out.height = out_height; - } - - return ret; + TSK_OBJECT_SAFE_FREE(params); + } + else if(tsk_striequals(att_name, "imageattr")) { + unsigned in_width, in_height, out_width, out_height; + unsigned width, height; + tsk_size_t s; + if(tmedia_parse_video_imageattr(att_value, TMEDIA_CODEC_VIDEO(h264)->pref_size, &in_width, &in_height, &out_width, &out_height) != 0) { + return tsk_false; + } + // check that 'imageattr' is comform to H.264 'profile-level' + if(tdav_codec_h264_common_size_from_level(h264->level, &width, &height) != 0) { + return tsk_false; + } + if((s = ((width * height * 3) >> 1)) < ((in_width * in_height * 3) >> 1) || s < ((out_width * out_height * 3) >> 1)) { + return tsk_false; + } + + TMEDIA_CODEC_VIDEO(h264)->in.width = in_width; + TMEDIA_CODEC_VIDEO(h264)->in.height = in_height; + TMEDIA_CODEC_VIDEO(h264)->out.width = out_width; + TMEDIA_CODEC_VIDEO(h264)->out.height = out_height; + outsize_changed = tsk_true; + } + + // clamp the output size to the defined max range + if (outsize_changed && tmedia_defaults_get_adapt_video_size_range_enabled()) { + if (tmedia_codec_video_clamp_out_size_to_range_max(TMEDIA_CODEC_VIDEO(h264)) != 0) { + ret = tsk_false; + } + } + + return ret; } static char* tdav_codec_h264_common_sdp_att_get(const tdav_codec_h264_common_t* h264, const char* att_name) -{ - if(!h264 || !att_name){ - TSK_DEBUG_ERROR("Invalid parameter"); - return tsk_null; - } - - if (tsk_striequals(att_name, "fmtp")) { - char* fmtp = tsk_null; +{ + if(!h264 || !att_name) { + TSK_DEBUG_ERROR("Invalid parameter"); + return tsk_null; + } + + if (tsk_striequals(att_name, "fmtp")) { + char* fmtp = tsk_null; #if 1 - // Required by "TANDBERG/4120 (X7.2.2)" and CISCO TelePresence - tsk_sprintf(&fmtp, "profile-level-id=%x;max-mbps=%d;max-fs=%d", - ((h264->profile << 16) | (h264->profile_iop << 8) | (h264->level & 0xff)), - MaxMBPS[H264_LEVEL_TO_ZERO_BASED_INDEX[h264->level]], - h264->maxFS - ); - // Do not restrict packetisation-mode until we knwon what the remote party supports - if (h264->pack_mode_remote != Unknown_Mode) { - tsk_strcat_2(&fmtp, ";packetization-mode=%d", h264->pack_mode_local); - } + // Required by "TANDBERG/4120 (X7.2.2)" and CISCO TelePresence + tsk_sprintf(&fmtp, "profile-level-id=%x;max-mbps=%d;max-fs=%d", + ((h264->profile << 16) | (h264->profile_iop << 8) | (h264->level & 0xff)), + MaxMBPS[H264_LEVEL_TO_ZERO_BASED_INDEX[h264->level]], + h264->maxFS + ); + // Do not restrict packetisation-mode until we knwon what the remote party supports + if (h264->pack_mode_remote != Unknown_Mode) { + tsk_strcat_2(&fmtp, ";packetization-mode=%d", h264->pack_mode_local); + } #else - tsk_sprintf(&fmtp, "profile-level-id=%x; packetization-mode=%d", ((h264->profile << 16) | (h264->profile_iop << 8) | (h264->level & 0xff)), h264->pack_mode); + tsk_sprintf(&fmtp, "profile-level-id=%x; packetization-mode=%d", ((h264->profile << 16) | (h264->profile_iop << 8) | (h264->level & 0xff)), h264->pack_mode); #endif - return fmtp; - } - else if(tsk_striequals(att_name, "imageattr")){ - return tmedia_get_video_imageattr(TMEDIA_CODEC_VIDEO(h264)->pref_size, - TMEDIA_CODEC_VIDEO(h264)->in.width, TMEDIA_CODEC_VIDEO(h264)->in.height, TMEDIA_CODEC_VIDEO(h264)->out.width, TMEDIA_CODEC_VIDEO(h264)->out.height); - } - return tsk_null; + return fmtp; + } + else if(tsk_striequals(att_name, "imageattr")) { + return tmedia_get_video_imageattr(TMEDIA_CODEC_VIDEO(h264)->pref_size, + TMEDIA_CODEC_VIDEO(h264)->in.width, TMEDIA_CODEC_VIDEO(h264)->in.height, TMEDIA_CODEC_VIDEO(h264)->out.width, TMEDIA_CODEC_VIDEO(h264)->out.height); + } + return tsk_null; } diff --git a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cuda.h b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cuda.h index 5dfae9c..e42a40d 100755 --- a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cuda.h +++ b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_cuda.h @@ -2,19 +2,19 @@ * Copyright (C) 2011-2014 Mamadou DIOP. * Copyright (C) 2011-2014 Doubango Telecom <http://www.doubango.org>. * -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -69,38 +69,37 @@ typedef struct NVEncoderParams NVEncoderParams; TDAV_BEGIN_DECLS -typedef struct tdav_codec_h264_cuda_s -{ - TDAV_DECLARE_CODEC_H264_COMMON; - - struct { - NVEncoder context; - NVEncoderParams ctx_params; - NVVE_CallbackParams clb_params; - void *buffer; - tsk_size_t buffer_size; - int64_t frame_count; - } encoder; - - struct { - tsk_mutex_handle_t *mutex; - CUvideodecoder context; - CUVIDDECODECREATEINFO info; - CUvideoparser cu_parser; - CUVIDPARSERPARAMS cu_paser_params; - CUdevice cu_device; - IDirect3D9 *dx_d3d; - IDirect3DDevice9 *dx_d3ddevice; - CUcontext cu_context; - void* accumulator; - tsk_size_t accumulator_pos; - tsk_size_t accumulator_size; - void *cu_buffer; - tsk_size_t cu_buffer_size; - tsk_size_t cu_buffer_pitch; - tsk_bool_t cu_buffer_avail; - uint16_t last_seq; - } decoder; +typedef struct tdav_codec_h264_cuda_s { + TDAV_DECLARE_CODEC_H264_COMMON; + + struct { + NVEncoder context; + NVEncoderParams ctx_params; + NVVE_CallbackParams clb_params; + void *buffer; + tsk_size_t buffer_size; + int64_t frame_count; + } encoder; + + struct { + tsk_mutex_handle_t *mutex; + CUvideodecoder context; + CUVIDDECODECREATEINFO info; + CUvideoparser cu_parser; + CUVIDPARSERPARAMS cu_paser_params; + CUdevice cu_device; + IDirect3D9 *dx_d3d; + IDirect3DDevice9 *dx_d3ddevice; + CUcontext cu_context; + void* accumulator; + tsk_size_t accumulator_pos; + tsk_size_t accumulator_size; + void *cu_buffer; + tsk_size_t cu_buffer_size; + tsk_size_t cu_buffer_pitch; + tsk_bool_t cu_buffer_avail; + uint16_t last_seq; + } decoder; } tdav_codec_h264_cuda_t; @@ -111,10 +110,10 @@ TINYDAV_GEXTERN const tmedia_codec_plugin_def_t *tdav_codec_h264_cuda_bp30_plugi tsk_bool_t tdav_codec_h264_cuda_is_supported(); static inline tsk_bool_t tdav_codec_h264_is_cuda_plugin(const tmedia_codec_plugin_def_t *plugin) { - if(plugin && (plugin == tdav_codec_h264_cuda_bp10_plugin_def_t || plugin == tdav_codec_h264_cuda_bp20_plugin_def_t || plugin == tdav_codec_h264_cuda_bp30_plugin_def_t)){ - return tsk_true; - } - return tsk_false; + if(plugin && (plugin == tdav_codec_h264_cuda_bp10_plugin_def_t || plugin == tdav_codec_h264_cuda_bp20_plugin_def_t || plugin == tdav_codec_h264_cuda_bp30_plugin_def_t)) { + return tsk_true; + } + return tsk_false; } TDAV_END_DECLS diff --git a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_rtp.h b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_rtp.h index 88796e4..23c3cc8 100755 --- a/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_rtp.h +++ b/tinyDAV/include/tinydav/codecs/h264/tdav_codec_h264_rtp.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -47,48 +47,48 @@ struct tdav_codec_h264_common_s; extern uint8_t H264_START_CODE_PREFIX[4]; typedef enum profile_idc_e { - profile_idc_none = 0, + profile_idc_none = 0, - profile_idc_baseline = 66, - profile_idc_extended = 88, - profile_idc_main = 77, - profile_idc_high = 100 + profile_idc_baseline = 66, + profile_idc_extended = 88, + profile_idc_main = 77, + profile_idc_high = 100 } profile_idc_t; typedef struct profile_iop_s { - unsigned constraint_set0_flag:1; - unsigned constraint_set1_flag:1; - unsigned constraint_set2_flag:1; - unsigned reserved_zero_5bits:5; + unsigned constraint_set0_flag:1; + unsigned constraint_set1_flag:1; + unsigned constraint_set2_flag:1; + unsigned reserved_zero_5bits:5; } profile_iop_t; typedef enum level_idc_e { - level_idc_none = 0, - - level_idc_1_0 = 10, - level_idc_1_b = 14, - level_idc_1_1 = 11, - level_idc_1_2 = 12, - level_idc_1_3 = 13, - level_idc_2_0 = 20, - level_idc_2_1 = 21, - level_idc_2_2 = 22, - level_idc_3_0 = 30, - level_idc_3_1 = 31, - level_idc_3_2 = 32, - level_idc_4_0 = 40, - level_idc_4_1 = 41, - level_idc_4_2 = 42, - level_idc_5_0 = 50, - level_idc_5_1 = 51, - level_idc_5_2 = 52, + level_idc_none = 0, + + level_idc_1_0 = 10, + level_idc_1_b = 14, + level_idc_1_1 = 11, + level_idc_1_2 = 12, + level_idc_1_3 = 13, + level_idc_2_0 = 20, + level_idc_2_1 = 21, + level_idc_2_2 = 22, + level_idc_3_0 = 30, + level_idc_3_1 = 31, + level_idc_3_2 = 32, + level_idc_4_0 = 40, + level_idc_4_1 = 41, + level_idc_4_2 = 42, + level_idc_5_0 = 50, + level_idc_5_1 = 51, + level_idc_5_2 = 52, } level_idc_t; -/* 5.2. Common Structure of the RTP Payload Format +/* 5.2. Common Structure of the RTP Payload Format Type Packet Type name Section --------------------------------------------------------- 0 undefined - @@ -101,17 +101,17 @@ level_idc_t; 29 FU-B Fragmentation unit 5.8 30-31 undefined - */ -typedef enum nal_unit_type_e{ +typedef enum nal_unit_type_e { undefined_0 = 0, nal_unit, stap_a = 24, stap_b = 25, mtap16 = 26, - mtap24 = 27, - fu_a = 28, + mtap24 = 27, + fu_a = 28, fu_b = 29, - undefined_30 = 30, - undefined_31 = 31 + undefined_30 = 30, + undefined_31 = 31 } nal_unit_type_t; diff --git a/tinyDAV/include/tinydav/codecs/ilbc/tdav_codec_ilbc.h b/tinyDAV/include/tinydav/codecs/ilbc/tdav_codec_ilbc.h index 4a48fad..ff66bba 100755 --- a/tinyDAV/include/tinydav/codecs/ilbc/tdav_codec_ilbc.h +++ b/tinyDAV/include/tinydav/codecs/ilbc/tdav_codec_ilbc.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -43,15 +43,14 @@ TDAV_BEGIN_DECLS /** iLBC codec */ -typedef struct tdav_codec_ilbc_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; +typedef struct tdav_codec_ilbc_s { + TMEDIA_DECLARE_CODEC_AUDIO; - iLBC_Enc_Inst_t encoder; - iLBC_Dec_Inst_t decoder; + iLBC_Enc_Inst_t encoder; + iLBC_Dec_Inst_t decoder; - float encblock[BLOCKL_MAX]; - float decblock[BLOCKL_MAX]; + float encblock[BLOCKL_MAX]; + float decblock[BLOCKL_MAX]; } tdav_codec_ilbc_t; diff --git a/tinyDAV/include/tinydav/codecs/mp4ves/tdav_codec_mp4ves.h b/tinyDAV/include/tinydav/codecs/mp4ves/tdav_codec_mp4ves.h index c7bf35a..a159bd8 100755 --- a/tinyDAV/include/tinydav/codecs/mp4ves/tdav_codec_mp4ves.h +++ b/tinyDAV/include/tinydav/codecs/mp4ves/tdav_codec_mp4ves.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/msrp/tdav_codec_msrp.h b/tinyDAV/include/tinydav/codecs/msrp/tdav_codec_msrp.h index 702c872..e7a908c 100755 --- a/tinyDAV/include/tinydav/codecs/msrp/tdav_codec_msrp.h +++ b/tinyDAV/include/tinydav/codecs/msrp/tdav_codec_msrp.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2010-2011 Mamadou DIOP. -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -32,9 +32,8 @@ TDAV_BEGIN_DECLS /** MSRP codec */ -typedef struct tdav_codec_msrp_s -{ - TMEDIA_DECLARE_CODEC_MSRP; +typedef struct tdav_codec_msrp_s { + TMEDIA_DECLARE_CODEC_MSRP; } tdav_codec_msrp_t; diff --git a/tinyDAV/include/tinydav/codecs/opus/tdav_codec_opus.h b/tinyDAV/include/tinydav/codecs/opus/tdav_codec_opus.h index c505f6d..eb94c7f 100755 --- a/tinyDAV/include/tinydav/codecs/opus/tdav_codec_opus.h +++ b/tinyDAV/include/tinydav/codecs/opus/tdav_codec_opus.h @@ -7,12 +7,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/speex/tdav_codec_speex.h b/tinyDAV/include/tinydav/codecs/speex/tdav_codec_speex.h index b577f02..b946878 100755 --- a/tinyDAV/include/tinydav/codecs/speex/tdav_codec_speex.h +++ b/tinyDAV/include/tinydav/codecs/speex/tdav_codec_speex.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -36,37 +36,35 @@ #include "tinymedia/tmedia_codec.h" -#include <speex/speex.h> +#include <speex/speex.h> TDAV_BEGIN_DECLS -typedef enum tdav_codec_speex_type_e -{ - tdav_codec_speex_type_nb, - tdav_codec_speex_type_wb, - tdav_codec_speex_type_uwb, +typedef enum tdav_codec_speex_type_e { + tdav_codec_speex_type_nb, + tdav_codec_speex_type_wb, + tdav_codec_speex_type_uwb, } tdav_codec_speex_type_t; /** Speex codec */ -typedef struct tdav_codec_speex_s -{ - TMEDIA_DECLARE_CODEC_AUDIO; - - tdav_codec_speex_type_t type; - - struct{ - void* state; - SpeexBits bits; - tsk_size_t size; - } encoder; - - struct { - void* state; - SpeexBits bits; - spx_int16_t* buffer; - tsk_size_t size; - } decoder; +typedef struct tdav_codec_speex_s { + TMEDIA_DECLARE_CODEC_AUDIO; + + tdav_codec_speex_type_t type; + + struct { + void* state; + SpeexBits bits; + tsk_size_t size; + } encoder; + + struct { + void* state; + SpeexBits bits; + spx_int16_t* buffer; + tsk_size_t size; + } decoder; } tdav_codec_speex_t; diff --git a/tinyDAV/include/tinydav/codecs/t140/tdav_codec_t140.h b/tinyDAV/include/tinydav/codecs/t140/tdav_codec_t140.h index 1b6d3c2..4fabfe5 100755 --- a/tinyDAV/include/tinydav/codecs/t140/tdav_codec_t140.h +++ b/tinyDAV/include/tinydav/codecs/t140/tdav_codec_t140.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2012 Mamadou Diop. -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -30,9 +30,8 @@ TDAV_BEGIN_DECLS -typedef struct tdav_codec_t140_s -{ - TMEDIA_DECLARE_CODEC; +typedef struct tdav_codec_t140_s { + TMEDIA_DECLARE_CODEC; } tdav_codec_t140_t; diff --git a/tinyDAV/include/tinydav/codecs/theora/tdav_codec_theora.h b/tinyDAV/include/tinydav/codecs/theora/tdav_codec_theora.h index e0614ed..90d0428 100755 --- a/tinyDAV/include/tinydav/codecs/theora/tdav_codec_theora.h +++ b/tinyDAV/include/tinydav/codecs/theora/tdav_codec_theora.h @@ -2,19 +2,19 @@ * Copyright (C) 2010-2011 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyDAV/include/tinydav/codecs/vpx/tdav_codec_vp8.h b/tinyDAV/include/tinydav/codecs/vpx/tdav_codec_vp8.h index 38580ad..7424ffb 100755 --- a/tinyDAV/include/tinydav/codecs/vpx/tdav_codec_vp8.h +++ b/tinyDAV/include/tinydav/codecs/vpx/tdav_codec_vp8.h @@ -2,19 +2,19 @@ * Copyright (C) 2011 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango(dot)org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * |
