wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-09-11 20:07:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #800 from wader/protobuf-string-bytes-value

Browse Source 
protobuf: No need for synthetic for string and bytes value
This commit is contained in:
Mattias Wadman 2023-10-29 16:23:35 +01:00 committed by GitHub
commit bed89f7d7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
format/mp4/testdata/pssh.fqtest vendored
View File

@ -120,36 +120,39 @@ $ fq ddv pssh.mp4
| | | wire_type: "length_delimited" (2)
0x4a0| 10 | . | length: 16 0x4a1-0x4a2 (1)
0x4a0| 88 37 80 c4 a9 81 49 4c b9 94 9e 93 79 2f| .7....IL....y/| wire_value: raw bits 0x4a2-0x4b2 (16)
0x4b0|f8 a7 |.. |
0x4a0| 88 37 80 c4 a9 81 49 4c b9 94 9e 93 79 2f| .7....IL....y/| value: raw bits 0x4a2-0x4b2 (16)
0x4b0|f8 a7 |.. |
| | | name: "key_id"
| | | type: "bytes"
| | | value: raw bits
| | | [2]{}: field 0x4b2-0x4c1 (15)
0x4b0| 1a | . | key_n: 26 0x4b2-0x4b3 (1)
| | | field_number: 3
| | | wire_type: "length_delimited" (2)
0x4b0| 0d | . | length: 13 0x4b3-0x4b4 (1)
0x4b0| 77 69 64 65 76 69 6e 65 5f 74 65 73| widevine_tes| wire_value: raw bits 0x4b4-0x4c1 (13)
0x4c0|74 |t |
0x4b0| 77 69 64 65 76 69 6e 65 5f 74 65 73| widevine_tes| value: "widevine_test" 0x4b4-0x4c1 (13)
0x4c0|74 |t |
| | | name: "provider"
| | | type: "string"
| | | value: "widevine_test"
| | | [3]{}: field 0x4c1-0x4cb (10)
0x4c0| 22 | " | key_n: 34 0x4c1-0x4c2 (1)
| | | field_number: 4
| | | wire_type: "length_delimited" (2)
0x4c0| 08 | . | length: 8 0x4c2-0x4c3 (1)
0x4c0| 31 32 33 34 35 36 37 38 | 12345678 | wire_value: raw bits 0x4c3-0x4cb (8)
0x4c0| 31 32 33 34 35 36 37 38 | 12345678 | value: raw bits 0x4c3-0x4cb (8)
| | | name: "content_id"
| | | type: "bytes"
| | | value: raw bits
| | | [4]{}: field 0x4cb-0x4d4 (9)
0x4c0| 32 | 2 | key_n: 50 0x4cb-0x4cc (1)
| | | field_number: 6
| | | wire_type: "length_delimited" (2)
0x4c0| 07 | . | length: 7 0x4cc-0x4cd (1)
0x4c0| 64 65 66| def| wire_value: raw bits 0x4cd-0x4d4 (7)
0x4d0|61 75 6c 74| |ault| |
0x4c0| 64 65 66| def| value: "default" 0x4cd-0x4d4 (7)
0x4d0|61 75 6c 74| |ault| |
| | | name: "policy"
| | | type: "string"
| | | value: "default"

11
format/protobuf/protobuf.go
View File

@ -7,7 +7,6 @@ import (
"github.com/wader/fq/format"
"github.com/wader/fq/internal/mathex"
"github.com/wader/fq/pkg/bitio"
"github.com/wader/fq/pkg/decode"
"github.com/wader/fq/pkg/interp"
"github.com/wader/fq/pkg/scalar"
@ -50,7 +49,7 @@ func protobufDecodeField(d *decode.D, pbm *format.ProtoBufMessage) {
var value uint64
var length uint64
var valueStart int64
var valuePos int64
switch wireType {
case wireTypeVarint:
value = d.FieldULEB128("wire_value")
@ -58,7 +57,7 @@ func protobufDecodeField(d *decode.D, pbm *format.ProtoBufMessage) {
value = d.FieldU64("wire_value")
case wireTypeLengthDelimited:
length = d.FieldULEB128("length")
valueStart = d.Pos()
valuePos = d.Pos()
d.FieldRawLen("wire_value", int64(length)*8)
case wireType32Bit:
value = d.FieldU32("wire_value")
@ -99,9 +98,11 @@ func protobufDecodeField(d *decode.D, pbm *format.ProtoBufMessage) {
case format.ProtoBufTypeDouble:
// TODO:
case format.ProtoBufTypeString:
d.FieldValueStr("value", string(d.BytesRange(valueStart, int(length))))
d.SeekAbs(valuePos)
d.FieldUTF8("value", int(length))
case format.ProtoBufTypeBytes:
d.FieldValueBitBuf("value", bitio.NewBitReader(d.BytesRange(valueStart, int(length)), -1))
d.SeekAbs(valuePos)
d.FieldRawLen("value", int64(length)*8)
case format.ProtoBufTypeMessage:
// TODO: test
d.FramedFn(int64(length)*8, func(d *decode.D) {