Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

1eeff3c5

Commit 1eeff3c5 authored 5 years ago by Adrien Béraud

Downloads
- Patches
- Plain Diff

Revert "media: split demuxer and decoder"

This reverts commit 880c285a.

Reason for revert: still needs work

Change-Id: I5851724e6b04ee185ef9a2b41d90caeb1b158461

parent 60515d89

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/media/audio/audio_input.cpp 18 additions, 13 deletions

src/media/audio/audio_input.cpp
src/media/audio/audio_receive_thread.cpp 28 additions, 6 deletions

src/media/audio/audio_receive_thread.cpp
src/media/audio/audiobuffer.cpp 7 additions, 7 deletions

src/media/audio/audiobuffer.cpp
src/media/audio/sound/audiofile.cpp 32 additions, 8 deletions

src/media/audio/sound/audiofile.cpp
src/media/media_buffer.h 0 additions, 2 deletions

src/media/media_buffer.h
src/media/media_decoder.cpp 145 additions, 134 deletions

src/media/media_decoder.cpp
src/media/media_decoder.h 64 additions, 112 deletions

src/media/media_decoder.h
src/media/video/video_base.cpp 0 additions, 8 deletions

src/media/video/video_base.cpp
src/media/video/video_base.h 0 additions, 1 deletion

src/media/video/video_base.h
src/media/video/video_input.cpp 34 additions, 14 deletions

src/media/video/video_input.cpp
src/media/video/video_receive_thread.cpp 50 additions, 13 deletions

src/media/video/video_receive_thread.cpp
src/media/video/video_receive_thread.h 1 addition, 1 deletion

src/media/video/video_receive_thread.h
src/observer.h 0 additions, 15 deletions

src/observer.h
test/unitTest/media/test_media_decoder.cpp 12 additions, 9 deletions

test/unitTest/media/test_media_decoder.cpp

with 391 additions and 343 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment