This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
p_ednet = Proto ("ednet", "EDNET") | |
local f = p_ednet.fields | |
f.magic = ProtoField.uint32("ednet.magic", "MAGIC", base.HEX) | |
f.crc = ProtoField.uint32("ednet.crc", "CRC", base.HEX) | |
f.cmd = ProtoField.uint16("ednet.cmd", "CMD", base.HEX) | |
f.noodles = ProtoField.uint16("ednet.noodles", "NOODLES", base.HEX) | |
f.len = ProtoField.uint16("ednet.len", "LENGTH", base.DEC) | |
f.data = ProtoField.bytes("ednet.data", "DATA") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From a860ebd0e3b0555aed30eb7e70920687f3651104 Mon Sep 17 00:00:00 2001 | |
From: InCheol Moon <moonpfe@emstone.com> | |
Date: Mon, 3 Sep 2018 16:31:07 +0900 | |
Subject: [PATCH] rtsp: use rtp timestamp and set frame size to 2040 | |
--- | |
edc-rtsp.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++--- | |
1 file changed, 76 insertions(+), 3 deletions(-) | |
diff --git a/edc-rtsp.c b/edc-rtsp.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/edc-codec.c b/edc-codec.c | |
index b4aa4278..206c0d46 100644 | |
--- a/edc-codec.c | |
+++ b/edc-codec.c | |
@@ -579,7 +579,7 @@ edc_codec_new (EdcCodecID codec_id, | |
else | |
codec->context_name = edc_strdup (codec->is_video ? "video" : "audio"); | |
- if (codec_id == EDC_CODEC_ADPCM) | |
+ if (0 && codec_id == EDC_CODEC_ADPCM) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/edc-rtsp.c b/edc-rtsp.c | |
index 161ca75d..e73aecdf 100644 | |
--- a/edc-rtsp.c | |
+++ b/edc-rtsp.c | |
@@ -20,6 +20,11 @@ | |
#include <libswresample/swresample.h> | |
#include <libavutil/random_seed.h> | |
#include <libavutil/intreadwrite.h> | |
+#include <libavutil/timestamp.h> | |
+#include <libavfilter/avfilter.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/edc-rtsp.c b/edc-rtsp.c | |
index 161ca75d..8438cfb8 100644 | |
--- a/edc-rtsp.c | |
+++ b/edc-rtsp.c | |
@@ -20,6 +20,7 @@ | |
#include <libswresample/swresample.h> | |
#include <libavutil/random_seed.h> | |
#include <libavutil/intreadwrite.h> | |
+#include <libavutil/timestamp.h> | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/mp4serv.c b/src/mp4serv.c | |
index 4b84abc30..f73d7704b 100644 | |
--- a/src/mp4serv.c | |
+++ b/src/mp4serv.c | |
@@ -123,21 +123,18 @@ struct _Mp4ServClient | |
struct | |
{ | |
- EdcAdpcm *decoder; | |
+ AVCodecContext *decoder; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/edc-rtsp.c b/edc-rtsp.c | |
index 161ca75d..6a2fe275 100644 | |
--- a/edc-rtsp.c | |
+++ b/edc-rtsp.c | |
@@ -902,7 +902,7 @@ edc_rtsp_make_audio_frame (EdcRtsp *rtsp, | |
buf = edc_buf_new_for_frame (pkt->size); | |
buf->channel = 0; | |
buf->flags = EDC_BUF_FLAG_AUDIO; | |
- buf->codec_id = rtsp->audio.codec_id; | |
+ buf->codec_id = EDC_CODEC_ALAW; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
static uint8_t * | |
mp4serv_get_codec_extradata (EdcBuf *frame, | |
int *extradata_size) | |
{ | |
AVBSFContext *bsf; | |
const AVBitStreamFilter *f; | |
const enum AVCodecID *ids; | |
AVPacket *dst_pkt; | |
int avcodec_id; | |
int found; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c69c805fc1194e225c3f2ddd2c7429f827d3684e Mon Sep 17 00:00:00 2001 | |
From: InCheol Moon <moonpfe@emstone.com> | |
Date: Thu, 23 Aug 2018 14:03:55 +0900 | |
Subject: [PATCH] mp4serv: use ffmpeg adpcm decoder | |
--- | |
src/mp4serv.c | 84 ++++++++++++++++++++------------------------------- | |
1 file changed, 32 insertions(+), 52 deletions(-) | |
diff --git a/src/mp4serv.c b/src/mp4serv.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/edc-buf.c b/edc-buf.c | |
index 1914e60c..65ba1e14 100644 | |
--- a/edc-buf.c | |
+++ b/edc-buf.c | |
@@ -56,6 +56,7 @@ edc_buf_new (guint len) | |
buf->flags = 0; | |
buf->width = 0; | |
buf->height = 0; | |
+ buf->codec_extra_len = 0; | |
buf->timestamp = 0; |
NewerOlder