Skip to content

Commit 2db21f1

Browse files
johngroAndroid Git Automerger
authored andcommitted
am 42a6382: LibAAH_RTP: Refactor TXGroup code, add unicast mode.
* commit '42a6382f1e318fab8a4ee2cd3a8e77fc158a5744': LibAAH_RTP: Refactor TXGroup code, add unicast mode.
2 parents bad6566 + 42a6382 commit 2db21f1

File tree

7 files changed

+1343
-529
lines changed

7 files changed

+1343
-529
lines changed

media/libaah_rtp/Android.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ LOCAL_SRC_FILES := \
1414
aah_rx_player_core.cpp \
1515
aah_rx_player_ring_buffer.cpp \
1616
aah_rx_player_substream.cpp \
17+
aah_tx_group.cpp \
1718
aah_tx_packet.cpp \
1819
aah_tx_player.cpp \
19-
aah_tx_group.cpp \
2020
pipe_event.cpp
2121

2222
LOCAL_C_INCLUDES := \
@@ -26,8 +26,9 @@ LOCAL_C_INCLUDES := \
2626
frameworks/base/media/libstagefright
2727

2828
LOCAL_SHARED_LIBRARIES := \
29-
libcommon_time_client \
3029
libbinder \
30+
libcommon_time_client \
31+
libcutils \
3132
libmedia \
3233
libstagefright \
3334
libstagefright_foundation \

media/libaah_rtp/aah_rx_player_core.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ bool AAH_RXPlayer::setupSocket() {
164164
if (res < 0) {
165165
uint32_t a = ntohl(bind_addr.sin_addr.s_addr);
166166
uint16_t p = ntohs(bind_addr.sin_port);
167-
LOGE("Failed to bind socket (%d) to %d.%d.%d.%d:%hd. (errno %d)",
167+
LOGE("Failed to bind socket (%d) to %d.%d.%d.%d:%hu. (errno %d)",
168168
sock_fd_,
169169
(a >> 24) & 0xFF,
170170
(a >> 16) & 0xFF,
@@ -194,7 +194,7 @@ bool AAH_RXPlayer::setupSocket() {
194194
LOGW("Failed to increase socket buffer size to %d. (errno %d)",
195195
buf_size, errno);
196196
} else {
197-
LOGI("RX socket buffer size is now %d bytes", buf_size);
197+
LOGD("RX socket buffer size is now %d bytes", buf_size);
198198
}
199199

200200
if (listen_addr_.sin_addr.s_addr) {

0 commit comments

Comments
 (0)