summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitrij D. Czarkoff <czarkoff@gmail.com>2015-09-27 14:50:11 +0200
committerDmitrij D. Czarkoff <czarkoff@gmail.com>2015-09-27 14:50:11 +0200
commita1dca0ee1cafaa9509cf34fd8d3913b78de764df (patch)
treeaa531b628e80d71b748fd396acb28de27a8e8060
parent2f84b80fa7e80ae85341c176d5376dd360589084 (diff)
daala: upstream doesn't have ogg_packet structure any more
-rw-r--r--modules/daala/decode.c14
-rw-r--r--modules/daala/encode.c26
2 files changed, 20 insertions, 20 deletions
diff --git a/modules/daala/decode.c b/modules/daala/decode.c
index 646605e..7b6170f 100644
--- a/modules/daala/decode.c
+++ b/modules/daala/decode.c
@@ -93,7 +93,7 @@ int daala_decode_update(struct viddec_state **vdsp, const struct vidcodec *vc,
int daala_decode(struct viddec_state *vds, struct vidframe *frame,
bool marker, uint16_t seq, struct mbuf *mb)
{
- ogg_packet op;
+ daala_packet dp;
bool ishdr;
int i, r, err = 0;
(void)seq;
@@ -117,16 +117,16 @@ int daala_decode(struct viddec_state *vds, struct vidframe *frame,
mbuf_get_left(mb));
#endif
- memset(&op, 0, sizeof(op));
+ memset(&dp, 0, sizeof(dp));
- op.packet = mbuf_buf(mb);
- op.bytes = mbuf_get_left(mb);
- op.b_o_s = marker;
+ dp.packet = mbuf_buf(mb);
+ dp.bytes = mbuf_get_left(mb);
+ dp.b_o_s = marker;
if (daala_packet_isheader(mbuf_buf(mb), mbuf_get_left(mb))) {
r = daala_decode_header_in(&vds->di, &vds->dc, &vds->ds,
- &op);
+ &dp);
if (r < 0) {
warning("daala: decoder: decode_header_in failed"
" (ret = %d)\n",
@@ -155,7 +155,7 @@ int daala_decode(struct viddec_state *vds, struct vidframe *frame,
return EPROTO;
}
- r = daala_decode_packet_in(vds->dec, &img, &op);
+ r = daala_decode_packet_in(vds->dec, &img, &dp);
if (r < 0) {
warning("daala: decode: packet_in error (%d)\n", r);
return EPROTO;
diff --git a/modules/daala/encode.c b/modules/daala/encode.c
index 338efcf..6b0249d 100644
--- a/modules/daala/encode.c
+++ b/modules/daala/encode.c
@@ -121,7 +121,7 @@ static int open_encoder(struct videnc_state *ves, const struct vidsz *size)
{
daala_info di;
daala_comment dc;
- ogg_packet op;
+ daala_packet dp;
int err = 0;
int complexity = 0;
int video_q = 10;
@@ -171,7 +171,7 @@ static int open_encoder(struct videnc_state *ves, const struct vidsz *size)
for (;;) {
int r;
- r = daala_encode_flush_header(ves->enc, &dc, &op);
+ r = daala_encode_flush_header(ves->enc, &dc, &dp);
if (r < 0) {
warning("daala: flush_header returned %d\n", r);
break;
@@ -180,19 +180,19 @@ static int open_encoder(struct videnc_state *ves, const struct vidsz *size)
break;
debug("daala: header: %lld bytes header=%d key=%d\n",
- op.bytes,
- daala_packet_isheader(op.packet, op.bytes),
- daala_packet_iskeyframe(op.packet, op.bytes));
+ dp.bytes,
+ daala_packet_isheader(dp.packet, dp.bytes),
+ daala_packet_iskeyframe(dp.packet, dp.bytes));
#if 0
re_printf("bos=%lld, eos=%lld, granule=%lld, packetno=%lld\n",
- op.b_o_s,
- op.e_o_s,
- op.granulepos,
- op.packetno);
+ dp.b_o_s,
+ dp.e_o_s,
+ dp.granulepos,
+ dp.packetno);
#endif
- err = send_packet(ves, op.b_o_s, op.packet, op.bytes);
+ err = send_packet(ves, dp.b_o_s, dp.packet, dp.bytes);
if (err)
break;
}
@@ -256,9 +256,9 @@ int daala_encode(struct videnc_state *ves, bool update,
}
for (;;) {
- ogg_packet op;
+ daala_packet dp;
- r = daala_encode_packet_out(ves->enc, 0, &op);
+ r = daala_encode_packet_out(ves->enc, 0, &dp);
if (r < 0) {
warning("daala: encoder: packet_out ret=%d\n", r);
break;
@@ -267,7 +267,7 @@ int daala_encode(struct videnc_state *ves, bool update,
break;
}
- err = send_packet(ves, op.b_o_s, op.packet, op.bytes);
+ err = send_packet(ves, dp.b_o_s, dp.packet, dp.bytes);
if (err)
break;
}