-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25183 from thexai/cleanup-read/write-bits
[cleanup] Use FFmpeg for AV_RBxx, AV_WBxx and AV_WLxx functions and drop 'BitstreamWriter.cpp'
- Loading branch information
Showing
7 changed files
with
19 additions
and
195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,27 +26,4 @@ class CBitstreamReader | |
int m_posBits{0}; | ||
}; | ||
|
||
const uint8_t* find_start_code(const uint8_t *p, const uint8_t *end, uint32_t *state); | ||
|
||
//////////////////////////////////////////////////////////////////////////////////////////// | ||
//! @todo refactor this so as not to need these ffmpeg routines. | ||
//! These are not exposed in ffmpeg's API so we dupe them here. | ||
|
||
/* | ||
* AVC helper functions for muxers | ||
* Copyright (c) 2006 Baptiste Coudurier <[email protected]> | ||
* This is part of FFmpeg | ||
* | ||
* SPDX-License-Identifier: LGPL-2.1-or-later | ||
* See LICENSES/README.md for more information. | ||
*/ | ||
constexpr uint32_t BS_RB24(const uint8_t* x) | ||
{ | ||
return (x[0] << 16) | (x[1] << 8) | x[2]; | ||
} | ||
|
||
constexpr uint32_t BS_RB32(const uint8_t* x) | ||
{ | ||
return (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3]; | ||
} | ||
|
||
const uint8_t* find_start_code(const uint8_t* p, const uint8_t* end, uint32_t* state); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters