mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-09-21 11:28:58 +03:00
a7e3b2e47b
There are two main issues fixed with this commit: * bytes vs. str: All file, image, and palette data are now handled as bytes. A new _binary module consolidates the hacks needed to do this across Python versions. tostring/fromstring methods have been renamed to tobytes/frombytes, but the Python 2.6/2.7 versions alias them to the old names for compatibility. Users should move to tobytes/frombytes. One other potentially-breaking change is that text data in image files (such as tags, comments) are now explicitly handled with a specific character encoding in mind. This works well with the Unicode str in Python 3, but may trip up old code expecting a straight byte-for-byte translation to a Python string. This also required a change to Gohlke's tags tests (in Tests/test_file_png.py) to expect Unicode strings from the code. * True div vs. floor div: Many division operations used the "/" operator to do floor division, which is now the "//" operator in Python 3. These were fixed. As of this commit, on the first pass, I have one failing test (improper handling of a slice object in a C module, test_imagepath.py) in Python 3, and three that that I haven't tried running yet (test_imagegl, test_imagegrab, and test_imageqt). I also haven't tested anything on Windows. All but the three skipped tests run flawlessly against Pythons 2.6 and 2.7.
84 lines
1.8 KiB
Python
84 lines
1.8 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# MPEG file handling
|
|
#
|
|
# History:
|
|
# 95-09-09 fl Created
|
|
#
|
|
# Copyright (c) Secret Labs AB 1997.
|
|
# Copyright (c) Fredrik Lundh 1995.
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
__version__ = "0.1"
|
|
|
|
from . import Image, ImageFile
|
|
from ._binary import i8
|
|
|
|
#
|
|
# Bitstream parser
|
|
|
|
class BitStream:
|
|
|
|
def __init__(self, fp):
|
|
self.fp = fp
|
|
self.bits = 0
|
|
self.bitbuffer = 0
|
|
|
|
def next(self):
|
|
return i8(self.fp.read(1))
|
|
|
|
def peek(self, bits):
|
|
while self.bits < bits:
|
|
c = self.next()
|
|
if c < 0:
|
|
self.bits = 0
|
|
continue
|
|
self.bitbuffer = (self.bitbuffer << 8) + c
|
|
self.bits = self.bits + 8
|
|
return self.bitbuffer >> (self.bits - bits) & (1 << bits) - 1
|
|
|
|
def skip(self, bits):
|
|
while self.bits < bits:
|
|
self.bitbuffer = (self.bitbuffer << 8) + i8(self.fp.read(1))
|
|
self.bits = self.bits + 8
|
|
self.bits = self.bits - bits
|
|
|
|
def read(self, bits):
|
|
v = self.peek(bits)
|
|
self.bits = self.bits - bits
|
|
return v
|
|
|
|
##
|
|
# Image plugin for MPEG streams. This plugin can identify a stream,
|
|
# but it cannot read it.
|
|
|
|
class MpegImageFile(ImageFile.ImageFile):
|
|
|
|
format = "MPEG"
|
|
format_description = "MPEG"
|
|
|
|
def _open(self):
|
|
|
|
s = BitStream(self.fp)
|
|
|
|
if s.read(32) != 0x1B3:
|
|
raise SyntaxError("not an MPEG file")
|
|
|
|
self.mode = "RGB"
|
|
self.size = s.read(12), s.read(12)
|
|
|
|
|
|
# --------------------------------------------------------------------
|
|
# Registry stuff
|
|
|
|
Image.register_open("MPEG", MpegImageFile)
|
|
|
|
Image.register_extension("MPEG", ".mpg")
|
|
Image.register_extension("MPEG", ".mpeg")
|
|
|
|
Image.register_mime("MPEG", "video/mpeg")
|