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

codec/h264/h264dec: merged in master an fixed conflicts

This commit is contained in:
Saxon 2019-07-19 20:22:25 +09:30
parent f11ba2b433 269b607606
commit ee12e4e90e
25 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
codec/h264/decode/go.mod
View File

@ -1,8 +0,0 @@
module github.com/ausocean/h264decode
go 1.12
require (
github.com/icza/bitio v0.0.0-20180221120200-b25b30b42508
github.com/pkg/errors v0.8.1
)

4
codec/h264/decode/go.sum
View File

@ -1,4 +0,0 @@
github.com/icza/bitio v0.0.0-20180221120200-b25b30b42508 h1:2LdkN1icT8cEFyB95fUbPE0TmQL9ZOjUv9MNJ1kg3XE=
github.com/icza/bitio v0.0.0-20180221120200-b25b30b42508/go.mod h1:1+iKpsBoI5fsqBTrjxjM81vidVQcxXCmDrM9vc6EU2w=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

0
codec/h264/decode/CODEOWNERS → codec/h264/h264dec/CODEOWNERS
View File

0
codec/h264/decode/LICENSE → codec/h264/h264dec/LICENSE
View File

0
codec/h264/decode/README.md → codec/h264/h264dec/README.md
View File

0
codec/h264/decode/bits/bitreader.go → codec/h264/h264dec/bits/bitreader.go
View File

0
codec/h264/decode/bits/bitreader_test.go → codec/h264/h264dec/bits/bitreader_test.go
View File

4
codec/h264/decode/cabac.go → codec/h264/h264dec/cabac.go
View File

@ -1,7 +1,7 @@
package h264 package h264dec
import ( import (
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
codec/h264/decode/cabac_test.go → codec/h264/h264dec/cabac_test.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
import "testing" import "testing"

2
codec/h264/decode/frame.go → codec/h264/h264dec/frame.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
// NALU types, as defined in table 7-1 in specifications. // NALU types, as defined in table 7-1 in specifications.
const ( const (

2
codec/h264/decode/mbtype.go → codec/h264/h264dec/mbtype.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
import ( import (
"errors" "errors"

2
codec/h264/decode/mbtype_test.go → codec/h264/h264dec/mbtype_test.go
View File

@ -8,7 +8,7 @@ DESCRIPTION
AUTHORS AUTHORS
Saxon Nelson-Milton <saxon@ausocean.org>, The Australian Ocean Laboratory (AusOcean) Saxon Nelson-Milton <saxon@ausocean.org>, The Australian Ocean Laboratory (AusOcean)
*/ */
package h264 package h264dec
import ( import (
"testing" "testing"

2
codec/h264/decode/mnvars.go → codec/h264/h264dec/mnvars.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
type MN struct { type MN struct {
M, N int M, N int

2
codec/h264/decode/nalunit.go → codec/h264/h264dec/nalunit.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
import ( import (
"io" "io"

4
codec/h264/decode/parse.go → codec/h264/h264dec/parse.go
View File

@ -11,12 +11,12 @@ AUTHORS
mrmod <mcmoranbjr@gmail.com> mrmod <mcmoranbjr@gmail.com>
*/ */
package h264 package h264dec
import ( import (
"math" "math"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

4
codec/h264/decode/parse_test.go → codec/h264/h264dec/parse_test.go
View File

@ -9,13 +9,13 @@ AUTHOR
Saxon Nelson-Milton <saxon@ausocean.org>, The Australian Ocean Laboratory (AusOcean) Saxon Nelson-Milton <saxon@ausocean.org>, The Australian Ocean Laboratory (AusOcean)
*/ */
package h264 package h264dec
import ( import (
"bytes" "bytes"
"testing" "testing"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
) )
// TestReadUe checks that readUe correctly parses an Exp-Golomb-coded element // TestReadUe checks that readUe correctly parses an Exp-Golomb-coded element

4
codec/h264/decode/pps.go → codec/h264/h264dec/pps.go
View File

@ -1,9 +1,9 @@
package h264 package h264dec
import ( import (
"math" "math"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
codec/h264/decode/rangetablps.go → codec/h264/h264dec/rangetablps.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
import "errors" import "errors"

4
codec/h264/decode/rbsp.go → codec/h264/h264dec/rbsp.go
View File

@ -1,9 +1,9 @@
package h264 package h264dec
import ( import (
"fmt" "fmt"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
) )
const ( const (

4
codec/h264/decode/read.go → codec/h264/h264dec/read.go
View File

@ -1,11 +1,11 @@
package h264 package h264dec
import ( import (
"fmt" "fmt"
"io" "io"
"os" "os"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

4
codec/h264/decode/server.go → codec/h264/h264dec/server.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
import ( import (
// "github.com/nareix/joy4/av" // "github.com/nareix/joy4/av"
@ -10,7 +10,7 @@ import (
"os" "os"
"os/signal" "os/signal"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
) )
// InitialNALU indicates the start of a h264 packet // InitialNALU indicates the start of a h264 packet

4
codec/h264/decode/slice.go → codec/h264/h264dec/slice.go
View File

@ -1,11 +1,11 @@
package h264 package h264dec
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"math" "math"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
codec/h264/decode/slice_test.go → codec/h264/h264dec/slice_test.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
import "testing" import "testing"

4
codec/h264/decode/sps.go → codec/h264/h264dec/sps.go
View File

@ -1,11 +1,11 @@
package h264 package h264dec
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"strings" "strings"
"github.com/ausocean/h264decode/h264/bits" "bitbucket.org/ausocean/av/codec/h264/h264dec/bits"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
codec/h264/decode/statetransxtab.go → codec/h264/h264dec/statetransxtab.go
View File

@ -1,4 +1,4 @@
package h264 package h264dec
type StateTransx struct { type StateTransx struct {
TransIdxLPS, TransIdxMPS int TransIdxLPS, TransIdxMPS int