Created
July 17, 2014 18:49
-
-
Save FlyingJester/87fb1c9b85a8e21eacb1 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
| 79be5ae HEAD@{0}: commit: Changes | |
| 73400d2 HEAD@{1}: commit: Cleaned up MediaCodec synchronization primitives. Improved flush and shutdown of MediaCodec decoder. | |
| d2f2e24 HEAD@{2}: rebase finished: returning to refs/heads/FMP4-MediaCodec2 | |
| d2f2e24 HEAD@{3}: rebase: Added synchro object. | |
| aadcc7a HEAD@{4}: rebase: Added fully synchronous flushing. | |
| 1e7728c HEAD@{5}: rebase: Rebased | |
| ffcb30b HEAD@{6}: rebase: Added proper frame drop on flush | |
| 03bba55 HEAD@{7}: rebase: Added proper frame drop on flush | |
| 92bb860 HEAD@{8}: rebase: Attempted frame drop until new keyframe on flush | |
| 7e3b6ef HEAD@{9}: rebase: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| f1c8f87 HEAD@{10}: rebase: Updated MediaCodec files. | |
| 3b6c80c HEAD@{11}: rebase: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 9c0adf2 HEAD@{12}: rebase: Fixed crash with stale MediaCodec buffer locations. | |
| df32922 HEAD@{13}: rebase: Added missing JNI initializations. | |
| 47468a9 HEAD@{14}: rebase: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| baadba4 HEAD@{15}: rebase: Fixed unfinished edits to AndroidDecoderUtils | |
| 4a20505 HEAD@{16}: rebase: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| a98c31f HEAD@{17}: rebase: checkout parentrepo/master | |
| 9f03f2c HEAD@{18}: commit: Added synchro object. | |
| a67d2c2 HEAD@{19}: rebase finished: returning to refs/heads/FMP4-MediaCodec2 | |
| a67d2c2 HEAD@{20}: rebase: Added fully synchronous flushing. | |
| fc7231e HEAD@{21}: rebase: Rebased | |
| 1da2f8b HEAD@{22}: rebase: Added proper frame drop on flush | |
| 91b4db3 HEAD@{23}: rebase: Added proper frame drop on flush | |
| 2b70676 HEAD@{24}: rebase: Attempted frame drop until new keyframe on flush | |
| 2b7240f HEAD@{25}: rebase: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| 3e3316e HEAD@{26}: rebase: Updated MediaCodec files. | |
| 86ece17 HEAD@{27}: rebase: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 153f29e HEAD@{28}: rebase: Fixed crash with stale MediaCodec buffer locations. | |
| e364a3d HEAD@{29}: rebase: Added missing JNI initializations. | |
| 69d2be1 HEAD@{30}: rebase: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| 7019dc9 HEAD@{31}: rebase: Fixed unfinished edits to AndroidDecoderUtils | |
| d2cdc5a HEAD@{32}: rebase: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| c628de7 HEAD@{33}: rebase: checkout parentrepo/master | |
| 6eead98 HEAD@{34}: commit: Added fully synchronous flushing. | |
| 4adf317 HEAD@{35}: rebase finished: returning to refs/heads/FMP4-MediaCodec2 | |
| 4adf317 HEAD@{36}: rebase: Rebased | |
| 1942f77 HEAD@{37}: rebase: Added proper frame drop on flush | |
| 68c8ddd HEAD@{38}: rebase: Added proper frame drop on flush | |
| 219f37d HEAD@{39}: rebase: Attempted frame drop until new keyframe on flush | |
| bacb600 HEAD@{40}: rebase: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| dfaf67a HEAD@{41}: rebase: Updated MediaCodec files. | |
| e583172 HEAD@{42}: rebase: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 22b2c61 HEAD@{43}: rebase: Fixed crash with stale MediaCodec buffer locations. | |
| 714f80d HEAD@{44}: rebase: Added missing JNI initializations. | |
| f644599 HEAD@{45}: rebase: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| 2b722f0 HEAD@{46}: rebase: Fixed unfinished edits to AndroidDecoderUtils | |
| 950ae89 HEAD@{47}: rebase: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| 14b7e01 HEAD@{48}: rebase: checkout parentrepo/master | |
| 9a68998 HEAD@{49}: rebase: checkout FMP4-MediaCodec2 | |
| 9a68998 HEAD@{50}: commit: Rebased | |
| 7dab0b1 HEAD@{51}: cherry-pick: Added proper frame drop on flush | |
| aa6c31c HEAD@{52}: cherry-pick: Added proper frame drop on flush | |
| beb73a8 HEAD@{53}: cherry-pick: Attempted frame drop until new keyframe on flush | |
| f113d58 HEAD@{54}: cherry-pick: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| 1a7b9fa HEAD@{55}: cherry-pick: Updated MediaCodec files. | |
| cb5339f HEAD@{56}: cherry-pick: Changed AndroidDecoderModule to use proper input/ouput flow | |
| bb8c8ca HEAD@{57}: cherry-pick: Fixed crash with stale MediaCodec buffer locations. | |
| f45201c HEAD@{58}: cherry-pick: Added missing JNI initializations. | |
| 85fcaf5 HEAD@{59}: cherry-pick: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| ce283f5 HEAD@{60}: cherry-pick: Fixed unfinished edits to AndroidDecoderUtils | |
| b5536e0 HEAD@{61}: cherry-pick: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| 6f80c55 HEAD@{62}: reset: moving to origin/master | |
| 828afa8 HEAD@{63}: cherry-pick: Added proper frame drop on flush | |
| b87d1fe HEAD@{64}: cherry-pick: Added proper frame drop on flush | |
| f9f13dd HEAD@{65}: cherry-pick: Attempted frame drop until new keyframe on flush | |
| b320047 HEAD@{66}: cherry-pick: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| 67751e2 HEAD@{67}: cherry-pick: Updated MediaCodec files. | |
| 0cbeea6 HEAD@{68}: cherry-pick: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 70993b2 HEAD@{69}: cherry-pick: Fixed crash with stale MediaCodec buffer locations. | |
| de03a13 HEAD@{70}: cherry-pick: Added missing JNI initializations. | |
| aa3f3b1 HEAD@{71}: cherry-pick: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| bc14ad9 HEAD@{72}: cherry-pick: Fixed unfinished edits to AndroidDecoderUtils | |
| e5dd968 HEAD@{73}: cherry-pick: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| 6f80c55 HEAD@{74}: reset: moving to origin/master | |
| b8bc9eb HEAD@{75}: cherry-pick: Added proper frame drop on flush | |
| 4d148c4 HEAD@{76}: cherry-pick: Added proper frame drop on flush | |
| a85a076 HEAD@{77}: cherry-pick: Attempted frame drop until new keyframe on flush | |
| e6c77fa HEAD@{78}: cherry-pick: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| 14e6d06 HEAD@{79}: cherry-pick: Updated MediaCodec files. | |
| 7c221d5 HEAD@{80}: cherry-pick: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 05419e6 HEAD@{81}: cherry-pick: Fixed crash with stale MediaCodec buffer locations. | |
| ca21977 HEAD@{82}: cherry-pick: Added missing JNI initializations. | |
| ef23360 HEAD@{83}: cherry-pick: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| d84d030 HEAD@{84}: cherry-pick: Fixed unfinished edits to AndroidDecoderUtils | |
| 5db7f31 HEAD@{85}: cherry-pick: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| 6f80c55 HEAD@{86}: reset: moving to origin/master | |
| feafc58 HEAD@{87}: revert: Revert "Relaxed Flush. Drop frames after a flush until a keyframe occurs." | |
| 41d139cf HEAD@{88}: cherry-pick: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| 8599e92 HEAD@{89}: cherry-pick: Updated MediaCodec files. | |
| 5cdbace HEAD@{90}: cherry-pick: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 234f8bc HEAD@{91}: cherry-pick: Fixed crash with stale MediaCodec buffer locations. | |
| df49b89 HEAD@{92}: cherry-pick: Added missing JNI initializations. | |
| 34ff19a HEAD@{93}: cherry-pick: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| d7c65ad HEAD@{94}: cherry-pick: Fixed unfinished edits to AndroidDecoderUtils | |
| 71e77f9 HEAD@{95}: cherry-pick: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| 6f80c55 HEAD@{96}: rebase finished: returning to refs/heads/master | |
| 6f80c55 HEAD@{97}: rebase: checkout origin | |
| 328b686 HEAD@{98}: commit: Added logging to incoming and outgoing sample metadata | |
| 2396608 HEAD@{99}: commit: Made InputExhausted() calls less spammy. | |
| f580339 HEAD@{100}: commit: Removed extra files | |
| 4b28203 HEAD@{101}: commit: Added proper frame drop on flush | |
| b60323a HEAD@{102}: revert: Revert "Attempted frame drop until new keyframe on flush" | |
| 60ea3b2 HEAD@{103}: checkout: moving from 56024f21ba5cbca855669b7675884c8faec7d587 to FMP4-MediaCodec | |
| 56024f2 HEAD@{104}: commit: Added proper frame drop on flush | |
| 88b7da9 HEAD@{105}: commit: Added proper frame drop on flush | |
| 60ea3b2 HEAD@{106}: checkout: moving from FMP4-MediaCodec to ... | |
| 60ea3b2 HEAD@{107}: commit: Attempted frame drop until new keyframe on flush | |
| 74501e0 HEAD@{108}: commit: Relaxed Flush. Drop frames after a flush until a keyframe occurs. | |
| cd2384f HEAD@{109}: commit: Updated MediaCodec files. | |
| c52e63d HEAD@{110}: commit: Changed AndroidDecoderModule to use proper input/ouput flow | |
| 2b3c962 HEAD@{111}: commit: Fixed crash with stale MediaCodec buffer locations. | |
| 9f3bc8a HEAD@{112}: commit: Added missing JNI initializations. | |
| 04b5911 HEAD@{113}: commit: Added blank decoder and Android MediaCodec code path for FMP4 module selection. | |
| 5d0e86a HEAD@{114}: commit: Fixed unfinished edits to AndroidDecoderUtils | |
| 3fbde89 HEAD@{115}: commit: Initial commit for JarClassProcessor and MediaCodec FMP4 | |
| a3c4c53 HEAD@{116}: checkout: moving from master to FMP4-MediaCodec | |
| a3c4c53 HEAD@{117}: clone: from https://github.com/mozilla/gecko-dev.git |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment