From f7b1f2f7b834cd1980d18636b3c9425a4dcd4b0f Mon Sep 17 00:00:00 2001 From: Saxon Date: Fri, 19 Jul 2019 15:19:15 +0930 Subject: [PATCH 1/4] codec/h264: decode pakage renamed to h264dec --- codec/h264/{decode => h264dec}/CODEOWNERS | 0 codec/h264/{decode => h264dec}/LICENSE | 0 codec/h264/{decode => h264dec}/README.md | 0 codec/h264/{decode => h264dec}/bits/bitreader.go | 0 codec/h264/{decode => h264dec}/bits/bitreader_test.go | 0 codec/h264/{decode => h264dec}/cabac.go | 0 codec/h264/{decode => h264dec}/cabac_test.go | 0 codec/h264/{decode => h264dec}/frame.go | 0 codec/h264/{decode => h264dec}/go.mod | 0 codec/h264/{decode => h264dec}/go.sum | 0 codec/h264/{decode => h264dec}/mbtype.go | 0 codec/h264/{decode => h264dec}/mbtype_test.go | 0 codec/h264/{decode => h264dec}/mnvars.go | 0 codec/h264/{decode => h264dec}/nalunit.go | 0 codec/h264/{decode => h264dec}/parse.go | 0 codec/h264/{decode => h264dec}/parse_test.go | 0 codec/h264/{decode => h264dec}/pps.go | 0 codec/h264/{decode => h264dec}/rangetablps.go | 0 codec/h264/{decode => h264dec}/rbsp.go | 0 codec/h264/{decode => h264dec}/read.go | 0 codec/h264/{decode => h264dec}/server.go | 0 codec/h264/{decode => h264dec}/slice.go | 0 codec/h264/{decode => h264dec}/slice_test.go | 0 codec/h264/{decode => h264dec}/sps.go | 0 codec/h264/{decode => h264dec}/statetransxtab.go | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename codec/h264/{decode => h264dec}/CODEOWNERS (100%) rename codec/h264/{decode => h264dec}/LICENSE (100%) rename codec/h264/{decode => h264dec}/README.md (100%) rename codec/h264/{decode => h264dec}/bits/bitreader.go (100%) rename codec/h264/{decode => h264dec}/bits/bitreader_test.go (100%) rename codec/h264/{decode => h264dec}/cabac.go (100%) rename codec/h264/{decode => h264dec}/cabac_test.go (100%) rename codec/h264/{decode => h264dec}/frame.go (100%) rename codec/h264/{decode => h264dec}/go.mod (100%) rename codec/h264/{decode => h264dec}/go.sum (100%) rename codec/h264/{decode => h264dec}/mbtype.go (100%) rename codec/h264/{decode => h264dec}/mbtype_test.go (100%) rename codec/h264/{decode => h264dec}/mnvars.go (100%) rename codec/h264/{decode => h264dec}/nalunit.go (100%) rename codec/h264/{decode => h264dec}/parse.go (100%) rename codec/h264/{decode => h264dec}/parse_test.go (100%) rename codec/h264/{decode => h264dec}/pps.go (100%) rename codec/h264/{decode => h264dec}/rangetablps.go (100%) rename codec/h264/{decode => h264dec}/rbsp.go (100%) rename codec/h264/{decode => h264dec}/read.go (100%) rename codec/h264/{decode => h264dec}/server.go (100%) rename codec/h264/{decode => h264dec}/slice.go (100%) rename codec/h264/{decode => h264dec}/slice_test.go (100%) rename codec/h264/{decode => h264dec}/sps.go (100%) rename codec/h264/{decode => h264dec}/statetransxtab.go (100%) diff --git a/codec/h264/decode/CODEOWNERS b/codec/h264/h264dec/CODEOWNERS similarity index 100% rename from codec/h264/decode/CODEOWNERS rename to codec/h264/h264dec/CODEOWNERS diff --git a/codec/h264/decode/LICENSE b/codec/h264/h264dec/LICENSE similarity index 100% rename from codec/h264/decode/LICENSE rename to codec/h264/h264dec/LICENSE diff --git a/codec/h264/decode/README.md b/codec/h264/h264dec/README.md similarity index 100% rename from codec/h264/decode/README.md rename to codec/h264/h264dec/README.md diff --git a/codec/h264/decode/bits/bitreader.go b/codec/h264/h264dec/bits/bitreader.go similarity index 100% rename from codec/h264/decode/bits/bitreader.go rename to codec/h264/h264dec/bits/bitreader.go diff --git a/codec/h264/decode/bits/bitreader_test.go b/codec/h264/h264dec/bits/bitreader_test.go similarity index 100% rename from codec/h264/decode/bits/bitreader_test.go rename to codec/h264/h264dec/bits/bitreader_test.go diff --git a/codec/h264/decode/cabac.go b/codec/h264/h264dec/cabac.go similarity index 100% rename from codec/h264/decode/cabac.go rename to codec/h264/h264dec/cabac.go diff --git a/codec/h264/decode/cabac_test.go b/codec/h264/h264dec/cabac_test.go similarity index 100% rename from codec/h264/decode/cabac_test.go rename to codec/h264/h264dec/cabac_test.go diff --git a/codec/h264/decode/frame.go b/codec/h264/h264dec/frame.go similarity index 100% rename from codec/h264/decode/frame.go rename to codec/h264/h264dec/frame.go diff --git a/codec/h264/decode/go.mod b/codec/h264/h264dec/go.mod similarity index 100% rename from codec/h264/decode/go.mod rename to codec/h264/h264dec/go.mod diff --git a/codec/h264/decode/go.sum b/codec/h264/h264dec/go.sum similarity index 100% rename from codec/h264/decode/go.sum rename to codec/h264/h264dec/go.sum diff --git a/codec/h264/decode/mbtype.go b/codec/h264/h264dec/mbtype.go similarity index 100% rename from codec/h264/decode/mbtype.go rename to codec/h264/h264dec/mbtype.go diff --git a/codec/h264/decode/mbtype_test.go b/codec/h264/h264dec/mbtype_test.go similarity index 100% rename from codec/h264/decode/mbtype_test.go rename to codec/h264/h264dec/mbtype_test.go diff --git a/codec/h264/decode/mnvars.go b/codec/h264/h264dec/mnvars.go similarity index 100% rename from codec/h264/decode/mnvars.go rename to codec/h264/h264dec/mnvars.go diff --git a/codec/h264/decode/nalunit.go b/codec/h264/h264dec/nalunit.go similarity index 100% rename from codec/h264/decode/nalunit.go rename to codec/h264/h264dec/nalunit.go diff --git a/codec/h264/decode/parse.go b/codec/h264/h264dec/parse.go similarity index 100% rename from codec/h264/decode/parse.go rename to codec/h264/h264dec/parse.go diff --git a/codec/h264/decode/parse_test.go b/codec/h264/h264dec/parse_test.go similarity index 100% rename from codec/h264/decode/parse_test.go rename to codec/h264/h264dec/parse_test.go diff --git a/codec/h264/decode/pps.go b/codec/h264/h264dec/pps.go similarity index 100% rename from codec/h264/decode/pps.go rename to codec/h264/h264dec/pps.go diff --git a/codec/h264/decode/rangetablps.go b/codec/h264/h264dec/rangetablps.go similarity index 100% rename from codec/h264/decode/rangetablps.go rename to codec/h264/h264dec/rangetablps.go diff --git a/codec/h264/decode/rbsp.go b/codec/h264/h264dec/rbsp.go similarity index 100% rename from codec/h264/decode/rbsp.go rename to codec/h264/h264dec/rbsp.go diff --git a/codec/h264/decode/read.go b/codec/h264/h264dec/read.go similarity index 100% rename from codec/h264/decode/read.go rename to codec/h264/h264dec/read.go diff --git a/codec/h264/decode/server.go b/codec/h264/h264dec/server.go similarity index 100% rename from codec/h264/decode/server.go rename to codec/h264/h264dec/server.go diff --git a/codec/h264/decode/slice.go b/codec/h264/h264dec/slice.go similarity index 100% rename from codec/h264/decode/slice.go rename to codec/h264/h264dec/slice.go diff --git a/codec/h264/decode/slice_test.go b/codec/h264/h264dec/slice_test.go similarity index 100% rename from codec/h264/decode/slice_test.go rename to codec/h264/h264dec/slice_test.go diff --git a/codec/h264/decode/sps.go b/codec/h264/h264dec/sps.go similarity index 100% rename from codec/h264/decode/sps.go rename to codec/h264/h264dec/sps.go diff --git a/codec/h264/decode/statetransxtab.go b/codec/h264/h264dec/statetransxtab.go similarity index 100% rename from codec/h264/decode/statetransxtab.go rename to codec/h264/h264dec/statetransxtab.go From ce3d98bd3b38ed374452c2d2bb115a71eb308481 Mon Sep 17 00:00:00 2001 From: Saxon Date: Fri, 19 Jul 2019 15:20:39 +0930 Subject: [PATCH 2/4] codec/h264/h264dec: changed packages from h264 to h264dec --- codec/h264/h264dec/cabac.go | 2 +- codec/h264/h264dec/cabac_test.go | 2 +- codec/h264/h264dec/frame.go | 2 +- codec/h264/h264dec/mbtype.go | 2 +- codec/h264/h264dec/mbtype_test.go | 2 +- codec/h264/h264dec/mnvars.go | 2 +- codec/h264/h264dec/nalunit.go | 2 +- codec/h264/h264dec/parse.go | 2 +- codec/h264/h264dec/parse_test.go | 2 +- codec/h264/h264dec/pps.go | 2 +- codec/h264/h264dec/rangetablps.go | 2 +- codec/h264/h264dec/rbsp.go | 2 +- codec/h264/h264dec/read.go | 2 +- codec/h264/h264dec/server.go | 2 +- codec/h264/h264dec/slice.go | 2 +- codec/h264/h264dec/slice_test.go | 2 +- codec/h264/h264dec/sps.go | 2 +- codec/h264/h264dec/statetransxtab.go | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/codec/h264/h264dec/cabac.go b/codec/h264/h264dec/cabac.go index 3697f630..72ebc9f3 100644 --- a/codec/h264/h264dec/cabac.go +++ b/codec/h264/h264dec/cabac.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "github.com/ausocean/h264decode/h264/bits" diff --git a/codec/h264/h264dec/cabac_test.go b/codec/h264/h264dec/cabac_test.go index 1c78b4a6..66d82a93 100644 --- a/codec/h264/h264dec/cabac_test.go +++ b/codec/h264/h264dec/cabac_test.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import "testing" diff --git a/codec/h264/h264dec/frame.go b/codec/h264/h264dec/frame.go index 94143f53..9e240a45 100644 --- a/codec/h264/h264dec/frame.go +++ b/codec/h264/h264dec/frame.go @@ -1,4 +1,4 @@ -package h264 +package h264dec // NALU types, as defined in table 7-1 in specifications. const ( diff --git a/codec/h264/h264dec/mbtype.go b/codec/h264/h264dec/mbtype.go index 2c3bc281..e335e756 100644 --- a/codec/h264/h264dec/mbtype.go +++ b/codec/h264/h264dec/mbtype.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "errors" diff --git a/codec/h264/h264dec/mbtype_test.go b/codec/h264/h264dec/mbtype_test.go index d735f9c8..a9fd988b 100644 --- a/codec/h264/h264dec/mbtype_test.go +++ b/codec/h264/h264dec/mbtype_test.go @@ -8,7 +8,7 @@ DESCRIPTION AUTHORS Saxon Nelson-Milton , The Australian Ocean Laboratory (AusOcean) */ -package h264 +package h264dec import ( "testing" diff --git a/codec/h264/h264dec/mnvars.go b/codec/h264/h264dec/mnvars.go index 3aba8d5e..2de1abf9 100644 --- a/codec/h264/h264dec/mnvars.go +++ b/codec/h264/h264dec/mnvars.go @@ -1,4 +1,4 @@ -package h264 +package h264dec type MN struct { M, N int diff --git a/codec/h264/h264dec/nalunit.go b/codec/h264/h264dec/nalunit.go index 35eeab76..f0ecbb32 100644 --- a/codec/h264/h264dec/nalunit.go +++ b/codec/h264/h264dec/nalunit.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "github.com/ausocean/h264decode/h264/bits" diff --git a/codec/h264/h264dec/parse.go b/codec/h264/h264dec/parse.go index 24ff222b..72a74e80 100644 --- a/codec/h264/h264dec/parse.go +++ b/codec/h264/h264dec/parse.go @@ -11,7 +11,7 @@ AUTHORS mrmod */ -package h264 +package h264dec import ( "math" diff --git a/codec/h264/h264dec/parse_test.go b/codec/h264/h264dec/parse_test.go index cc2d47e0..42c74a6b 100644 --- a/codec/h264/h264dec/parse_test.go +++ b/codec/h264/h264dec/parse_test.go @@ -9,7 +9,7 @@ AUTHOR Saxon Nelson-Milton , The Australian Ocean Laboratory (AusOcean) */ -package h264 +package h264dec import ( "bytes" diff --git a/codec/h264/h264dec/pps.go b/codec/h264/h264dec/pps.go index 4e659649..646e4762 100644 --- a/codec/h264/h264dec/pps.go +++ b/codec/h264/h264dec/pps.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "math" diff --git a/codec/h264/h264dec/rangetablps.go b/codec/h264/h264dec/rangetablps.go index 3bcfb000..56f759ae 100644 --- a/codec/h264/h264dec/rangetablps.go +++ b/codec/h264/h264dec/rangetablps.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import "errors" diff --git a/codec/h264/h264dec/rbsp.go b/codec/h264/h264dec/rbsp.go index 57826439..cad5faef 100644 --- a/codec/h264/h264dec/rbsp.go +++ b/codec/h264/h264dec/rbsp.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "fmt" diff --git a/codec/h264/h264dec/read.go b/codec/h264/h264dec/read.go index c50180dd..3f15e188 100644 --- a/codec/h264/h264dec/read.go +++ b/codec/h264/h264dec/read.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "fmt" diff --git a/codec/h264/h264dec/server.go b/codec/h264/h264dec/server.go index f702c1eb..2b439d96 100644 --- a/codec/h264/h264dec/server.go +++ b/codec/h264/h264dec/server.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( // "github.com/nareix/joy4/av" diff --git a/codec/h264/h264dec/slice.go b/codec/h264/h264dec/slice.go index 4e669917..488303c8 100644 --- a/codec/h264/h264dec/slice.go +++ b/codec/h264/h264dec/slice.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "bytes" diff --git a/codec/h264/h264dec/slice_test.go b/codec/h264/h264dec/slice_test.go index 98b052ef..e7988a7e 100644 --- a/codec/h264/h264dec/slice_test.go +++ b/codec/h264/h264dec/slice_test.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import "testing" diff --git a/codec/h264/h264dec/sps.go b/codec/h264/h264dec/sps.go index 5258d0f4..03b511f2 100644 --- a/codec/h264/h264dec/sps.go +++ b/codec/h264/h264dec/sps.go @@ -1,4 +1,4 @@ -package h264 +package h264dec import ( "bytes" diff --git a/codec/h264/h264dec/statetransxtab.go b/codec/h264/h264dec/statetransxtab.go index 31f15fcd..5338e5e4 100644 --- a/codec/h264/h264dec/statetransxtab.go +++ b/codec/h264/h264dec/statetransxtab.go @@ -1,4 +1,4 @@ -package h264 +package h264dec type StateTransx struct { TransIdxLPS, TransIdxMPS int From 5d31c4936015b84aa94dc38cc85e8b3b80be5605 Mon Sep 17 00:00:00 2001 From: Saxon Date: Fri, 19 Jul 2019 15:21:17 +0930 Subject: [PATCH 3/4] code/h264/h264dec: removed go module stuff --- codec/h264/h264dec/go.mod | 8 -------- codec/h264/h264dec/go.sum | 4 ---- 2 files changed, 12 deletions(-) delete mode 100644 codec/h264/h264dec/go.mod delete mode 100644 codec/h264/h264dec/go.sum diff --git a/codec/h264/h264dec/go.mod b/codec/h264/h264dec/go.mod deleted file mode 100644 index ffa61433..00000000 --- a/codec/h264/h264dec/go.mod +++ /dev/null @@ -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 -) diff --git a/codec/h264/h264dec/go.sum b/codec/h264/h264dec/go.sum deleted file mode 100644 index 15c64706..00000000 --- a/codec/h264/h264dec/go.sum +++ /dev/null @@ -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= From 3914bc1422d00befbacd313f68b8402f2c11d4d6 Mon Sep 17 00:00:00 2001 From: Saxon Date: Fri, 19 Jul 2019 15:44:45 +0930 Subject: [PATCH 4/4] codec/h264/h264dec: fixed import paths --- codec/h264/h264dec/cabac.go | 2 +- codec/h264/h264dec/nalunit.go | 2 +- codec/h264/h264dec/parse.go | 2 +- codec/h264/h264dec/parse_test.go | 2 +- codec/h264/h264dec/pps.go | 2 +- codec/h264/h264dec/rbsp.go | 2 +- codec/h264/h264dec/read.go | 2 +- codec/h264/h264dec/server.go | 2 +- codec/h264/h264dec/slice.go | 2 +- codec/h264/h264dec/sps.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/codec/h264/h264dec/cabac.go b/codec/h264/h264dec/cabac.go index 72ebc9f3..47d90835 100644 --- a/codec/h264/h264dec/cabac.go +++ b/codec/h264/h264dec/cabac.go @@ -1,7 +1,7 @@ package h264dec import ( - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" ) diff --git a/codec/h264/h264dec/nalunit.go b/codec/h264/h264dec/nalunit.go index f0ecbb32..49d34aea 100644 --- a/codec/h264/h264dec/nalunit.go +++ b/codec/h264/h264dec/nalunit.go @@ -1,7 +1,7 @@ package h264dec import ( - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" ) diff --git a/codec/h264/h264dec/parse.go b/codec/h264/h264dec/parse.go index 72a74e80..86baaece 100644 --- a/codec/h264/h264dec/parse.go +++ b/codec/h264/h264dec/parse.go @@ -16,7 +16,7 @@ package h264dec import ( "math" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" ) diff --git a/codec/h264/h264dec/parse_test.go b/codec/h264/h264dec/parse_test.go index 42c74a6b..c936ca3d 100644 --- a/codec/h264/h264dec/parse_test.go +++ b/codec/h264/h264dec/parse_test.go @@ -15,7 +15,7 @@ import ( "bytes" "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 diff --git a/codec/h264/h264dec/pps.go b/codec/h264/h264dec/pps.go index 646e4762..139306c6 100644 --- a/codec/h264/h264dec/pps.go +++ b/codec/h264/h264dec/pps.go @@ -3,7 +3,7 @@ package h264dec import ( "math" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" ) diff --git a/codec/h264/h264dec/rbsp.go b/codec/h264/h264dec/rbsp.go index cad5faef..271076ae 100644 --- a/codec/h264/h264dec/rbsp.go +++ b/codec/h264/h264dec/rbsp.go @@ -3,7 +3,7 @@ package h264dec import ( "fmt" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" ) const ( diff --git a/codec/h264/h264dec/read.go b/codec/h264/h264dec/read.go index 3f15e188..92a12ed9 100644 --- a/codec/h264/h264dec/read.go +++ b/codec/h264/h264dec/read.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" ) diff --git a/codec/h264/h264dec/server.go b/codec/h264/h264dec/server.go index 2b439d96..301bfae5 100644 --- a/codec/h264/h264dec/server.go +++ b/codec/h264/h264dec/server.go @@ -10,7 +10,7 @@ import ( "os" "os/signal" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" ) // InitialNALU indicates the start of a h264 packet diff --git a/codec/h264/h264dec/slice.go b/codec/h264/h264dec/slice.go index 488303c8..b25b4502 100644 --- a/codec/h264/h264dec/slice.go +++ b/codec/h264/h264dec/slice.go @@ -5,7 +5,7 @@ import ( "fmt" "math" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" ) diff --git a/codec/h264/h264dec/sps.go b/codec/h264/h264dec/sps.go index 03b511f2..c4aabd22 100644 --- a/codec/h264/h264dec/sps.go +++ b/codec/h264/h264dec/sps.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/ausocean/h264decode/h264/bits" + "bitbucket.org/ausocean/av/codec/h264/h264dec/bits" "github.com/pkg/errors" )