mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

codec/h264/h2646dec/cavlc.go: fixed build error caused by rebase

This commit is contained in:
Saxon 2019-09-09 16:48:06 +09:30
parent d78ca2d2d2
commit 05e16ec260
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/h264/h264dec/cavlc.go
View File

@ -147,7 +147,7 @@ type block struct {
// the specifications to obtain a value of nC, parse coeff_token from br and // the specifications to obtain a value of nC, parse coeff_token from br and
// then use table 9-5 to find corresponding values of TrailingOnes(coeff_token) // then use table 9-5 to find corresponding values of TrailingOnes(coeff_token)
// and TotalCoeff(coeff_token) which are then subsequently returned. // and TotalCoeff(coeff_token) which are then subsequently returned.
func parseTotalCoeffAndTrailingOnes(br *bits.BitReader, ctx *SliceContext, usingMbPredMode bool, level, maxNumCoef, inBlockIdx int) (totalCoeff, trailingOnes, nC, outBlockIdx int, err error) { func parseTotalCoeffAndTrailingOnes(br *bits.BitReader, vid *VideoStream, ctx *SliceContext, usingMbPredMode bool, level, maxNumCoef, inBlockIdx int) (totalCoeff, trailingOnes, nC, outBlockIdx int, err error) {
if level == chromaDCLevel { if level == chromaDCLevel {
if ctx.chromaArrayType == 1 { if ctx.chromaArrayType == 1 {
nC = -1 nC = -1
@ -181,7 +181,7 @@ func parseTotalCoeffAndTrailingOnes(br *bits.BitReader, ctx *SliceContext, using
var n [2]int var n [2]int
for i := range availableFlag { for i := range availableFlag {
// Step 5. // Step 5.
if !(!available(mbAddr[i]) || usingMbPredMode || ctx.ConstrainedIntraPred || if !(!available(mbAddr[i]) || usingMbPredMode || vid.ConstrainedIntraPred ||
mbAddr[i].usingInterMbPredMode || ctx.nalType == 2 || ctx.nalType == 3 || ctx.nalType == 4) { mbAddr[i].usingInterMbPredMode || ctx.nalType == 2 || ctx.nalType == 3 || ctx.nalType == 4) {
availableFlag[i] = true availableFlag[i] = true
} }