Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions av2/common/annexA.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
* 1 | C_Main_422_10 | Main | 8, 10 | 4:0:0, 4:2:0, 4:2:2
* 2 | C_Main_444_10 | Main | 8, 10 | 4:0:0, 4:2:0, 4:4:4
* 3-63 | Reserved | - | - |

*
* Notes:
* - ConfigurationID: Identifies the multi-sequence configuration (6-bit value)
Expand Down Expand Up @@ -273,22 +272,21 @@ int av2_check_profile_interop_conformance(
//==============================================================================================
// Table A.2: Definition of ProfileScalingFactor, PicSizeProfileFactor, and BitrateProfileFactor
//==============================================================================================
*
* seq_profile_idc or multistream_profile_idc | ProfileScalingFactor | PicSizeProfileFactor | BitrateProfileFactor |
* ------------------------------------------------------------------------------------------------------------------
* 0, 1, 2 | 0 | 15 | 1.0 |
* ------------------------------------------------------------------------------------------------------------------
* 3 | 1 | 20 | 1.667 |
* ------------------------------------------------------------------------------------------------------------------
* 4 | 2 | 30 | 2.5 |
* ------------------------------------------------------------------------------------------------------------------
* 31 | - | - | - |
* ------------------------------------------------------------------------------------------------------------------

*
* seq_profile_idc or multistream_profile_idc | ProfileScalingFactor | PicSizeProfileFactor | BitrateProfileFactor |
* ------------------------------------------------------------------------------------------------------------------
* 0, 1, 2 | 0 | 15 | 1.0 |
* ------------------------------------------------------------------------------------------------------------------
* 3 | 1 | 20 | 1.667 |
* ------------------------------------------------------------------------------------------------------------------
* 4 | 2 | 30 | 2.5 |
* ------------------------------------------------------------------------------------------------------------------
* 31 | - | - | - |
* ------------------------------------------------------------------------------------------------------------------
*/
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 286 is the most important change. The addition of "*/" fixes the following compiler warning:

av2/common/annexA.c:288:1: warning: '/*' within block comment [-Wcomment]
  288 | /* clang-format on */
      | ^

/* clang-format on */

int get_profile_scaling_factor(int seq_profile_idc) {

if (seq_profile_idc == MAIN_420_10_IP0 ||
seq_profile_idc == MAIN_420_10_IP1 ||
seq_profile_idc == MAIN_420_10_IP2) {
Expand Down